Vm-dev November 2013

vm-dev@lists.squeakfoundation.org

30 participants
103 discussions

VM Maker: VMMaker.oscog-eem.525.mcz
by commits＠source.squeak.org 27 Nov '13

27 Nov '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.525.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.525 Author: eem Time: 26 November 2013, 5:38:29.693 pm UUID: 6e1e8f4a-3f4c-4aef-87cc-ad1016a9dbf8 Ancestors: VMMaker.oscog-eem.524 Correct detachFreeObject: given that freeChunkPrevIndex is not maintained. Nuke all uses of freeChunkPrevIndex. Fix dumb bugs in SpurMemoryManager>>assimilateNewSegment: & allocateOldSpaceChunkOfExactlyBytes:suchThat:. Change totalFreeListBytes to check that list nodes in the tree have a null parent. Correct and then comment-out the delay wakeup code in CogVMSimulator>>primitiveSignalAtMilliseconds. =============== Diff against VMMaker.oscog-eem.524 =============== Item was changed: ----- Method: CogVMSimulator>>primitiveSignalAtMilliseconds (in category 'system control primitives') ----- primitiveSignalAtMilliseconds super primitiveSignalAtMilliseconds. + "self successful ifTrue: - self successful ifTrue: [Transcript cr; nextPutAll: thisContext selector; nextPutAll: ' now '; nextPutAll: self ioUTCMicroseconds hex; nextPutAll: ' wakeup '; nextPutAll: nextWakeupUsecs hex; + nextPutAll: ' wakeup - now '; print: nextWakeupUsecs - self ioUTCMicroseconds; flush]"! - nextPutAll: ' wakeup - now '; print: self ioUTCMicroseconds - nextWakeupUsecs; flush]! Item was removed: - ----- Method: Spur32BitMemoryManager>>sortedFreeObject: (in category 'free space') ----- - sortedFreeObject: objOop - "A variant of freeObject: that assumes objOop already has its valid number of slots, etc, - but makes sure the freeChunkPrevIndex is valid." - | bytes treeNode nextNode | - bytes := self bytesInObject: objOop. - totalFreeOldSpace := totalFreeOldSpace + bytes. - self longAt: objOop put: 0. - treeNode := self addToFreeList: objOop bytes: bytes. - treeNode ~= 0 ifTrue: - [self storePointer: self freeChunkPrevIndex ofFreeChunk: objOop withValue: treeNode]. - nextNode := self fetchPointer: self freeChunkNextIndex ofObject: objOop. - nextNode ~= 0 ifTrue: - [self storePointer: self freeChunkPrevIndex ofFreeChunk: nextNode withValue: objOop]! Item was changed: ----- Method: SpurMemoryManager>>addToFreeTree:bytes: (in category 'free space') ----- addToFreeTree: freeChunk bytes: chunkBytes "Add freeChunk to the large free chunk tree. For the benefit of sortedFreeObject:, answer the treeNode it is added to, if it is added to the next list of a freeTreeNode, otherwise answer 0." | childBytes parent child | self assert: (self isFreeObject: freeChunk). self assert: chunkBytes = (self bytesInObject: freeChunk). self assert: chunkBytes / self allocationUnit >= self numFreeLists. self storePointer: self freeChunkNextIndex ofFreeChunk: freeChunk withValue: 0; storePointer: self freeChunkParentIndex ofFreeChunk: freeChunk withValue: 0; storePointer: self freeChunkSmallerIndex ofFreeChunk: freeChunk withValue: 0; + storePointer: self freeChunkLargerIndex ofFreeChunk: freeChunk withValue: 0. - storePointer: self freeChunkLargerIndex ofFreeChunk: freeChunk withValue: 0; - storePointer: self freeChunkPrevIndex ofFreeChunk: freeChunk withValue: 0. "Large chunk list organized as a tree, each node of which is a list of chunks of the same size. Beneath the node are smaller and larger blocks." parent := 0. child := freeLists at: 0. [child ~= 0] whileTrue: [childBytes := self bytesInObject: child. childBytes = chunkBytes ifTrue: "size match; add to list at node." [self storePointer: self freeChunkNextIndex ofFreeChunk: freeChunk withValue: (self fetchPointer: self freeChunkNextIndex ofObject: child); storePointer: self freeChunkNextIndex ofFreeChunk: child withValue: freeChunk. ^child]. "walk down the tree" parent := child. child := self fetchPointer: (childBytes > chunkBytes ifTrue: [self freeChunkSmallerIndex] ifFalse: [self freeChunkLargerIndex]) ofFreeChunk: child]. parent = 0 ifTrue: [self assert: (freeLists at: 0) = 0. freeLists at: 0 put: freeChunk. freeListsMask := freeListsMask bitOr: 1. ^0]. self assert: (freeListsMask anyMask: 1). "insert in tree" self storePointer: self freeChunkParentIndex ofFreeChunk: freeChunk withValue: parent. self storePointer: (childBytes > chunkBytes ifTrue: [self freeChunkSmallerIndex] ifFalse: [self freeChunkLargerIndex]) ofFreeChunk: parent withValue: freeChunk. ^0! Item was changed: ----- Method: SpurMemoryManager>>allocateOldSpaceChunkOfExactlyBytes:suchThat: (in category 'free space') ----- allocateOldSpaceChunkOfExactlyBytes: chunkBytes suchThat: acceptanceBlock "Answer a chunk of oldSpace from the free lists that satisfies acceptanceBlock, if one of this size is available, otherwise answer nil. N.B. the chunk is simply a pointer, it has no valid header. The caller *must* fill in the header correctly." | index node next prev child childBytes | <inline: true> "must inline for acceptanceBlock" "for debugging:" "totalFreeOldSpace := self totalFreeListBytes" index := chunkBytes / self allocationUnit. index < self numFreeLists ifTrue: [(freeListsMask anyMask: 1 << index) ifTrue: [(node := freeLists at: index) = 0 ifTrue: [freeListsMask := freeListsMask - (1 << index)] ifFalse: [prev := 0. [node ~= 0] whileTrue: [self assert: node = (self startOfObject: node). self assert: (self isValidFreeObject: node). next := self fetchPointer: self freeChunkNextIndex ofFreeChunk: node. (acceptanceBlock value: node) ifTrue: [prev = 0 ifTrue: [freeLists at: index put: next] ifFalse: [self storePointer: self freeChunkNextIndex ofFreeChunk: prev withValue: next]. totalFreeOldSpace := totalFreeOldSpace - chunkBytes. ^node]. + prev := node. node := next]]]. ^nil]. "Large chunk. Search the large chunk list. Large chunk list organized as a tree, each node of which is a list of chunks of the same size. Beneath the node are smaller and larger blocks. When the search ends parent should hold the first chunk of the same size as chunkBytes, or 0 if none." node := 0. child := freeLists at: 0. [child ~= 0] whileTrue: [self assert: (self isValidFreeObject: child). childBytes := self bytesInObject: child. childBytes = chunkBytes ifTrue: "size match; try to remove from list at node first." [node := child. [prev := node. node := self fetchPointer: self freeChunkNextIndex ofFreeChunk: node. node ~= 0] whileTrue: [(acceptanceBlock value: node) ifTrue: [self assert: (self isValidFreeObject: node). self storePointer: self freeChunkNextIndex ofFreeChunk: prev withValue: (self fetchPointer: self freeChunkNextIndex ofFreeChunk: node). totalFreeOldSpace := totalFreeOldSpace - chunkBytes. ^self startOfObject: node]]. (acceptanceBlock value: child) ifFalse: [^nil]. "node was right size but unaceptable." next := self fetchPointer: self freeChunkNextIndex ofFreeChunk: child. next = 0 ifTrue: "no list; remove the interior node" [self unlinkSolitaryFreeTreeNode: child] ifFalse: "list; replace node with it" [self inFreeTreeReplace: child with: next]. totalFreeOldSpace := totalFreeOldSpace - chunkBytes. ^self startOfObject: child] ifFalse: "no size match; walk down the tree" [child := self fetchPointer: (childBytes < chunkBytes ifTrue: [self freeChunkLargerIndex] ifFalse: [self freeChunkSmallerIndex]) ofFreeChunk: child]]. ^nil! Item was changed: ----- Method: SpurMemoryManager>>assimilateNewSegment: (in category 'growing/shrinking memory') ----- assimilateNewSegment: segInfo "Update after adding a segment. Here we set freeOldSpaceStart & endOfMemory if required." <var: #segInfo type: #'SpurSegmentInfo *'> + segInfo segLimit >= endOfMemory ifTrue: - segInfo segStart >= endOfMemory ifTrue: [freeOldSpaceStart := endOfMemory := segInfo segLimit - self bridgeSize]! Item was changed: ----- Method: SpurMemoryManager>>detachFreeObject: (in category 'free space') ----- detachFreeObject: freeChunk + "This is a rare operation, so its efficiency isn't critical. + Having a valid prev link for tree nodes would help." <inline: false> + | chunkBytes result | - | chunkBytes index node prev next | chunkBytes := self bytesInObject: freeChunk. + result := self allocateOldSpaceChunkOfExactlyBytes: chunkBytes suchThat: [:f| f = freeChunk]. + self assert: result = (self startOfObject: freeChunk)! - totalFreeOldSpace := totalFreeOldSpace - chunkBytes. - index := chunkBytes / self allocationUnit. - index >= self numFreeLists ifTrue: - [^self detachLargeFreeObject: freeChunk]. - node := freeLists at: index. - freeChunk = node - ifTrue: - [(freeLists at: index put: (self fetchPointer: self freeChunkNextIndex ofFreeChunk: node)) = 0 ifTrue: - [self assert: (freeListsMask anyMask: 1 << index). - freeListsMask := freeListsMask - (1 << index)]] - ifFalse: - [prev := 0. - [node ~= 0] whileTrue: - [self assert: node = (self startOfObject: node). - self assert: (self isValidFreeObject: node). - next := self fetchPointer: self freeChunkNextIndex ofFreeChunk: node. - node = freeChunk ifTrue: - [prev = 0 - ifTrue: [freeLists at: index put: next] - ifFalse: [self storePointer: self freeChunkNextIndex ofFreeChunk: prev withValue: next]. - ^node]. - node := next]]! Item was removed: - ----- Method: SpurMemoryManager>>detachLargeFreeObject: (in category 'free space') ----- - detachLargeFreeObject: freeChunk - | prev next | - prev := self fetchPointer: self freeChunkPrevIndex ofObject: freeChunk. - next := self fetchPointer: self freeChunkNextIndex ofObject: freeChunk. - prev = 0 - ifTrue: "freeChunk is a treeNode" - [next = 0 - ifTrue: "remove it from the tree" - [self unlinkSolitaryFreeTreeNode: freeChunk] - ifFalse: "replace freeChunk by its next node." - [self unlinkFreeTreeNode: freeChunk withSiblings: next]] - ifFalse: "freeChunk is a list node; simple" - [self storePointer: self freeChunkNextIndex ofFreeChunk: prev withValue: next. - next ~= 0 ifTrue: - [self storePointer: self freeChunkPrevIndex ofFreeChunk: next withValue: prev]]! Item was removed: - ----- Method: SpurMemoryManager>>freeChunkPrevIndex (in category 'free space') ----- - freeChunkPrevIndex - "for quickly unlinking nodes in the tree of large free chunks." - ^5! Item was changed: ----- Method: SpurMemoryManager>>setFree: (in category 'free space') ----- setFree: objOop + <inline: true> "turn the object into a free chunk, zeroing classIndex, format, isGrey,isPinned,isRemembered,isImmutable & ?." self long32At: objOop put: 0! Item was changed: ----- Method: SpurMemoryManager>>totalFreeListBytes (in category 'free space') ----- totalFreeListBytes + "This method both computes the actual number of free bytes by traversing all free objects + on the free lists/tree, and checks that the tree is valid. It is used mainly by checkFreeSpace." | totalFreeBytes bytesInChunk listNode | totalFreeBytes := 0. 1 to: self numFreeLists - 1 do: [:i| bytesInChunk := i * self allocationUnit. listNode := freeLists at: i. [listNode ~= 0] whileTrue: [totalFreeBytes := totalFreeBytes + bytesInChunk. self assert: (self isValidFreeObject: listNode). self assert: bytesInChunk = (self bytesInObject: listNode). listNode := self fetchPointer: self freeChunkNextIndex ofFreeChunk: listNode]]. self freeTreeNodesDo: [:treeNode| bytesInChunk := self bytesInObject: treeNode. self assert: bytesInChunk / self allocationUnit >= self numFreeLists. listNode := treeNode. [listNode ~= 0] whileTrue: ["self printFreeChunk: listNode" self assert: (self isValidFreeObject: listNode). + self assert: (listNode = treeNode + or: [(self fetchPointer: self freeChunkParentIndex ofFreeChunk: listNode) = 0]). totalFreeBytes := totalFreeBytes + bytesInChunk. self assert: bytesInChunk = (self bytesInObject: listNode). listNode := self fetchPointer: self freeChunkNextIndex ofFreeChunk: listNode]. treeNode]. ^totalFreeBytes! Item was changed: ----- Method: SpurMemoryManager>>unlinkFreeTreeNode:withSiblings: (in category 'free space') ----- unlinkFreeTreeNode: freeTreeNode withSiblings: next "Unlink a freeTreeNode. Assumes the node has a list (non-null next link)." | parent smaller larger | parent := self fetchPointer: self freeChunkParentIndex ofObject: freeTreeNode. smaller := self fetchPointer: self freeChunkSmallerIndex ofObject: freeTreeNode. larger := self fetchPointer: self freeChunkLargerIndex ofObject: freeTreeNode. - self storePointer: self freeChunkPrevIndex ofFreeChunk: next withValue: 0. parent = 0 ifTrue: [freeLists at: 0 put: next] ifFalse: [self storePointer: (freeTreeNode = (self fetchPointer: self freeChunkSmallerIndex ofObject: parent) ifTrue: [self freeChunkSmallerIndex] ifFalse: [self freeChunkLargerIndex]) ofFreeChunk: parent withValue: next. self storePointer: self freeChunkParentIndex ofFreeChunk: next withValue: parent]. self storePointer: self freeChunkSmallerIndex ofFreeChunk: next withValue: smaller. smaller ~= 0 ifTrue: [self storePointer: self freeChunkParentIndex ofFreeChunk: smaller withValue: next]. self storePointer: self freeChunkLargerIndex ofFreeChunk: next withValue: larger. larger ~= 0 ifTrue: [self storePointer: self freeChunkParentIndex ofFreeChunk: larger withValue: next]!

1 0

Does Cog Interpreter state and cycle differ from the standard VM ?
by gettimothy 26 Nov '13

26 Nov '13

Does Cog Interpreter state and cycle differ from the standard VM ? Details are not needed, just a heads up so that when I do get to Cog work, I make it a point to study them. >From the Blue Book, here is the definition of Interpreter State and Cycle: Interpreter State: 1. The CompiledMethod whose bytecodes ar being executed. 2. The location of the next bytecode to be executed in that CompiledMethod: i.e its /instruction pointer/ 3. The receiver and arguments of the message that invoked the CompiledMethod. 4. Any temporary variables needed by the CompiledMethod. 5. a stack. Interpreter Cycle: 1. fetch the bytecode from the CompiledMethod indicated by the instruction pointer. 2. Increment the instruction pointer. 3. Perform the function specified by the bytecode. thx. t

3 4

VM Maker: VMMaker.oscog-eem.524.mcz
by commits＠source.squeak.org 26 Nov '13

26 Nov '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.524.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.524 Author: eem Time: 26 November 2013, 12:44:23.505 pm UUID: 8795596f-5c5e-44de-9a9f-926f991d208b Ancestors: VMMaker.oscog-eem.523 Modify eliminateAndFreeForwarders to coalesce forwarders with free space. Fix bugs in unlinkFreeTreeNode:withSiblings: & addToFreeTree:bytes: (failure to clear prev and set parent). Add some analysis/debugging routines to print uncoalesced free chunks and potentially compactible objects. =============== Diff against VMMaker.oscog-eem.523 =============== Item was added: + ----- Method: Spur32BitMMLECoSimulator>>setFree: (in category 'free space') ----- + setFree: o + "o = 16r113E7A8 ifTrue: [self halt]." + super setFree: o! Item was changed: ----- Method: SpurMemoryManager>>addToFreeTree:bytes: (in category 'free space') ----- addToFreeTree: freeChunk bytes: chunkBytes "Add freeChunk to the large free chunk tree. For the benefit of sortedFreeObject:, answer the treeNode it is added to, if it is added to the next list of a freeTreeNode, otherwise answer 0." | childBytes parent child | self assert: (self isFreeObject: freeChunk). self assert: chunkBytes = (self bytesInObject: freeChunk). self assert: chunkBytes / self allocationUnit >= self numFreeLists. self storePointer: self freeChunkNextIndex ofFreeChunk: freeChunk withValue: 0; storePointer: self freeChunkParentIndex ofFreeChunk: freeChunk withValue: 0; storePointer: self freeChunkSmallerIndex ofFreeChunk: freeChunk withValue: 0; + storePointer: self freeChunkLargerIndex ofFreeChunk: freeChunk withValue: 0; + storePointer: self freeChunkPrevIndex ofFreeChunk: freeChunk withValue: 0. - storePointer: self freeChunkLargerIndex ofFreeChunk: freeChunk withValue: 0. "Large chunk list organized as a tree, each node of which is a list of chunks of the same size. Beneath the node are smaller and larger blocks." parent := 0. child := freeLists at: 0. [child ~= 0] whileTrue: [childBytes := self bytesInObject: child. childBytes = chunkBytes ifTrue: "size match; add to list at node." [self storePointer: self freeChunkNextIndex ofFreeChunk: freeChunk withValue: (self fetchPointer: self freeChunkNextIndex ofObject: child); storePointer: self freeChunkNextIndex ofFreeChunk: child withValue: freeChunk. ^child]. "walk down the tree" parent := child. child := self fetchPointer: (childBytes > chunkBytes ifTrue: [self freeChunkSmallerIndex] ifFalse: [self freeChunkLargerIndex]) ofFreeChunk: child]. parent = 0 ifTrue: [self assert: (freeLists at: 0) = 0. freeLists at: 0 put: freeChunk. freeListsMask := freeListsMask bitOr: 1. ^0]. self assert: (freeListsMask anyMask: 1). "insert in tree" self storePointer: self freeChunkParentIndex ofFreeChunk: freeChunk withValue: parent. self storePointer: (childBytes > chunkBytes ifTrue: [self freeChunkSmallerIndex] ifFalse: [self freeChunkLargerIndex]) ofFreeChunk: parent withValue: freeChunk. ^0! Item was added: + ----- Method: SpurMemoryManager>>checkForCompactableObjects (in category 'debug support') ----- + checkForCompactableObjects + "self checkForCompactableObjects" + <doNotGenerate> + | firstFree them sizes | + firstFree := 0. + self allOldSpaceEntitiesDo: [:o| (firstFree = 0 and: [self isFreeObject: o]) ifTrue: [firstFree := o]]. + firstFree = 0 ifTrue: [^nil]. + sizes := Bag new. + self allFreeObjectsDo: + [:f| sizes add: (self bytesInObject: f)]. + them := OrderedCollection new. + self allOldSpaceObjectsFrom: firstFree do: + [:o| | b | + b := self bytesInObject: o. + (sizes includes: b) ifTrue: + [them add: o. + sizes remove: b]]. + ^them isEmpty ifFalse: + [{them size. them first. them last}]! Item was added: + ----- Method: SpurMemoryManager>>detachFreeObject: (in category 'free space') ----- + detachFreeObject: freeChunk + <inline: false> + | chunkBytes index node prev next | + chunkBytes := self bytesInObject: freeChunk. + totalFreeOldSpace := totalFreeOldSpace - chunkBytes. + index := chunkBytes / self allocationUnit. + index >= self numFreeLists ifTrue: + [^self detachLargeFreeObject: freeChunk]. + node := freeLists at: index. + freeChunk = node + ifTrue: + [(freeLists at: index put: (self fetchPointer: self freeChunkNextIndex ofFreeChunk: node)) = 0 ifTrue: + [self assert: (freeListsMask anyMask: 1 << index). + freeListsMask := freeListsMask - (1 << index)]] + ifFalse: + [prev := 0. + [node ~= 0] whileTrue: + [self assert: node = (self startOfObject: node). + self assert: (self isValidFreeObject: node). + next := self fetchPointer: self freeChunkNextIndex ofFreeChunk: node. + node = freeChunk ifTrue: + [prev = 0 + ifTrue: [freeLists at: index put: next] + ifFalse: [self storePointer: self freeChunkNextIndex ofFreeChunk: prev withValue: next]. + ^node]. + node := next]]! Item was changed: ----- Method: SpurMemoryManager>>eliminateAndFreeForwarders (in category 'gc - global') ----- eliminateAndFreeForwarders + "As the final phase of global garbage collect, sweep the heap to follow + forwarders, then free forwarders, coalescing with free space as we go." + | lowestFree firstFree lastFree | - "As the final phase of global garbage collect, sweep - the heap to follow forwarders, then free forwarders" - | lowestForwarded firstForwarded lastForwarded | <inline: false> + self flag: 'this might be unnecessary. if we were to track firstFreeChunk we might be able to repeat the freeUnmarkedObjectsAndSortAndCoalesceFreeSpace; compact cycle until firstFreeChunk reaches a fixed point'. self assert: (self isForwarded: nilObj) not. self assert: (self isForwarded: falseObj) not. self assert: (self isForwarded: trueObj) not. self assert: (self isForwarded: self freeListsObj) not. self assert: (self isForwarded: hiddenRootsObj) not. self assert: (self isForwarded: classTableFirstPage) not. (self isForwarded: specialObjectsOop) ifTrue: [specialObjectsOop := self followForwarded: specialObjectsOop]. + "N.B. we don't have to explicitly do mapInterpreterOops - "N.B. we don't have to explcitly do mapInterpreterOops since the scavenge below will do it." self followForwardedObjStacks. scavenger followRememberedForwardersAndForgetFreeObjects. self doScavenge: DontTenureButDoUnmark. self checkFreeSpace. + lowestFree := 0. - lowestForwarded := 0. "sweep, following forwarders in all live objects, and finding the first forwarder." + self allOldSpaceEntitiesDo: - self allOldSpaceObjectsDo: [:o| + ((self isFreeObject: o) or: [self isForwarded: o]) - (self isForwarded: o) ifTrue: + [lowestFree = 0 ifTrue: + [lowestFree := o]] - [lowestForwarded = 0 ifTrue: - [lowestForwarded := o]] ifFalse: [0 to: (self numPointerSlotsOf: o) - 1 do: [:i| | f | f := self fetchPointer: i ofObject: o. (self isOopForwarded: f) ifTrue: [f := self followForwarded: f. self assert: (self isYoung: f) not. self storePointerUnchecked: i ofObject: o withValue: f]]]]. self checkFreeSpace. + lowestFree = 0 ifTrue: "yeah, right..." + [^self]. + firstFree := lastFree := 0. + "Sweep from lowest forwarder, coalescing runs of forwarders and free objects." + self allOldSpaceEntitiesFrom: lowestFree do: - firstForwarded := lastForwarded := 0. - "sweep from lowest forwarder, coalescing runs of forwarders. perhaps this should - coalewsce free space and forwarders. the previous loop could reprise the discarding - of free space in freeUnmarkedObjectsAndSortAndCoalesceFreeSpace." - self allOldSpaceEntitiesFrom: lowestForwarded do: [:o| + (self isFreeObject: o) + ifTrue: "two cases, isolated, in which case leave alone, or adjacent, + in which case, remove from free set prior to coalesce." + [| next | + next := self objectAfter: o limit: endOfMemory. + self assert: (next = endOfMemory or: [(self isFreeObject: next) not]). "free chunks have already been coalesced" + (firstFree ~= 0 + or: [next ~= endOfMemory and: [self isForwarded: next]]) ifTrue: + [firstFree = 0 ifTrue: + [firstFree := o]. + lastFree := o. + self detachFreeObject: o. + self checkFreeSpace]] - (self isForwarded: o) - ifTrue: - [firstForwarded = 0 ifTrue: - [firstForwarded := o]. - lastForwarded := o] ifFalse: + [(self isForwarded: o) + ifTrue: + [firstFree = 0 ifTrue: + [firstFree := o]. + lastFree := o] + ifFalse: + [firstFree ~= 0 ifTrue: + [| start bytes | + start := self startOfObject: firstFree. + bytes := (self addressAfter: lastFree) - start. + self addFreeChunkWithBytes: bytes at: start. + self checkFreeSpace]. + firstFree := 0]]]. + firstFree ~= 0 ifTrue: - [firstForwarded ~= 0 ifTrue: - [| start bytes | - start := self startOfObject: firstForwarded. - bytes := (self addressAfter: lastForwarded) - start. - self addFreeChunkWithBytes: bytes at: start]. - firstForwarded := 0]]. - firstForwarded ~= 0 ifTrue: [| start bytes | + start := self startOfObject: firstFree. + bytes := (self addressAfter: lastFree) - start. - start := self startOfObject: firstForwarded. - bytes := (self addressAfter: lastForwarded) - start. self addFreeChunkWithBytes: bytes at: start]. self checkFreeSpace! Item was added: + ----- Method: SpurMemoryManager>>printAdjacentFreeChunks (in category 'debug support') ----- + printAdjacentFreeChunks + "self printAdjacentFreeChunks" + <doNotGenerate> + | uncoalesced | + uncoalesced := OrderedCollection new. + self allOldSpaceEntitiesDo: + [:e| | s | + ((self isFreeObject: e) + and: [(s := self objectAfter: e limit: endOfMemory) < endOfMemory + and: [self isFreeObject: s]]) ifTrue: + [uncoalesced addLast: e]]. + uncoalesced do: + [:f| + self printFreeChunk: f. coInterpreter printHexnp: (self objectAfter: f limit: endOfMemory); cr] + ! Item was changed: ----- Method: SpurMemoryManager>>unlinkFreeTreeNode:withSiblings: (in category 'free space') ----- unlinkFreeTreeNode: freeTreeNode withSiblings: next "Unlink a freeTreeNode. Assumes the node has a list (non-null next link)." | parent smaller larger | parent := self fetchPointer: self freeChunkParentIndex ofObject: freeTreeNode. smaller := self fetchPointer: self freeChunkSmallerIndex ofObject: freeTreeNode. larger := self fetchPointer: self freeChunkLargerIndex ofObject: freeTreeNode. self storePointer: self freeChunkPrevIndex ofFreeChunk: next withValue: 0. parent = 0 ifTrue: [freeLists at: 0 put: next] ifFalse: [self storePointer: (freeTreeNode = (self fetchPointer: self freeChunkSmallerIndex ofObject: parent) ifTrue: [self freeChunkSmallerIndex] ifFalse: [self freeChunkLargerIndex]) ofFreeChunk: parent + withValue: next. + self storePointer: self freeChunkParentIndex ofFreeChunk: next withValue: parent]. - withValue: next]. self storePointer: self freeChunkSmallerIndex ofFreeChunk: next withValue: smaller. smaller ~= 0 ifTrue: [self storePointer: self freeChunkParentIndex ofFreeChunk: smaller withValue: next]. self storePointer: self freeChunkLargerIndex ofFreeChunk: next withValue: larger. larger ~= 0 ifTrue: [self storePointer: self freeChunkParentIndex ofFreeChunk: larger withValue: next]!

1 0

VM Maker: VMMaker.oscog-eem.523.mcz
by commits＠source.squeak.org 26 Nov '13

26 Nov '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.523.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.523 Author: eem Time: 26 November 2013, 9:50:25.332 am UUID: 1e6e967d-05a9-413a-9b22-5d5907ecfb5a Ancestors: VMMaker.oscog-eem.522 Fix bug in fUOASACFS that was causing it to not collect large free chunks for sorting, and hence resulting in compact moving almost no objects. Fix assert in SpurCircularBuffer>>reverseDo:, found now that there is compaction occurring. Resurrect exactFitCompact and fix its exit condition. Add some isFreeObject: asserts. Add clone VM to the CogVMSimulator utilitiesMenu:. =============== Diff against VMMaker.oscog-eem.522 =============== Item was added: + ----- Method: CogVMSimulator>>cloneSimulation (in category 'debug support') ----- + cloneSimulation + | savedDisplayView savedDisplayForm savedQuitBlock savedTranscript | + savedDisplayView := displayView. displayView := nil. + savedDisplayForm := displayForm. displayForm = nil. + savedQuitBlock := quitBlock. quitBlock := nil. + savedTranscript := transcript. transcript := nil. + + [| clone window | + clone := self veryDeepCopy. + window := clone openAsMorph. + window setLabel: 'Clone of ', (savedDisplayView containingWindow label allButFirst: 'Simulation of ' size)] + ensure: + [displayView := savedDisplayView. + displayForm = savedDisplayForm. + quitBlock := savedQuitBlock. + transcript := savedTranscript]! Item was changed: ----- Method: CogVMSimulator>>utilitiesMenu: (in category 'UI') ----- utilitiesMenu: aMenuMorph aMenuMorph add: 'toggle transcript' action: #toggleTranscript; + add: 'clone VM' action: #cloneSimulation; addLine; add: 'print ext head frame' action: #printExternalHeadFrame; add: 'print int head frame' action: #printHeadFrame; add: 'print mc/cog frame' action: [self printFrame: cogit processor fp WithSP: cogit processor sp]; add: 'short print ext frame & callers' action: [self shortPrintFrameAndCallers: framePointer]; add: 'short print int frame & callers' action: [self shortPrintFrameAndCallers: localFP]; add: 'short print mc/cog frame & callers' action: [self shortPrintFrameAndCallers: cogit processor fp]; add: 'long print ext frame & callers' action: [self printFrameAndCallers: framePointer SP: stackPointer]; add: 'long print int frame & callers' action: [self printFrameAndCallers: localFP SP: localSP]; add: 'long print mc/cog frame & callers' action: [self printFrameAndCallers: cogit processor fp SP: cogit processor sp]; add: 'print frame...' action: [(self promptHex: 'print frame') ifNotNil: [:fp| self printFrame: fp]]; add: 'print call stack' action: #printCallStack; add: 'print stack call stack' action: #printStackCallStack; add: 'print call stack of...' action: [(self promptHex: 'context or process oop') ifNotNil: [:obj| self printCallStackOf: obj]]; add: 'print all stacks' action: #printAllStacks; add: 'write back local ptrs' action: [stackPointer := localSP. framePointer := localFP. instructionPointer := localIP. self writeBackHeadFramePointers]; add: 'write back mc ptrs' action: [stackPointer := cogit processor sp. framePointer := cogit processor fp. instructionPointer := cogit processor eip. self writeBackHeadFramePointers]; addLine; add: 'print registers' action: [cogit processor printRegistersOn: transcript]; add: 'disassemble method/trampoline...' action: [(self promptHex: 'pc') ifNotNil: [:pc| cogit disassembleCodeAt: pc]]; add: 'disassemble method/trampoline at pc' action: [cogit disassembleCodeAt: cogit processor pc]; add: 'disassemble ext head frame method' action: [cogit disassembleMethod: (self frameMethod: framePointer)]; add: 'print oop...' action: [(self promptHex: 'print oop') ifNotNil: [:oop| self printOop: oop]]; add: 'long print oop...' action: [(self promptHex: 'print oop') ifNotNil: [:oop| self longPrintOop: oop]]; addLine; add: 'inspect object memory' target: objectMemory action: #inspect; add: 'inspect cointerpreter' action: #inspect; add: 'inspect cogit' target: cogit action: #inspect; add: 'inspect method zone' target: cogit methodZone action: #inspect. self isThreadedVM ifTrue: [aMenuMorph add: 'inspect thread manager' target: self threadManager action: #inspect]. aMenuMorph addLine; add: 'print cog methods' target: cogMethodZone action: #printCogMethods; add: 'print trampoline table' target: cogit action: #printTrampolineTable; add: 'print prim trace log' action: #dumpPrimTraceLog; add: 'report recent instructions' target: cogit action: #reportLastNInstructions; add: 'set break pc...' action: [(self promptHex: 'break pc') ifNotNil: [:bpc| cogit breakPC: bpc]]; add: (cogit singleStep ifTrue: ['no single step'] ifFalse: ['single step']) action: [cogit singleStep: cogit singleStep not]; add: (cogit printRegisters ifTrue: ['no print registers each instruction'] ifFalse: ['print registers each instruction']) action: [cogit printRegisters: cogit printRegisters not]; add: (cogit printInstructions ifTrue: ['no print instructions each instruction'] ifFalse: ['print instructions each instruction']) action: [cogit printInstructions: cogit printInstructions not]; addLine; add: 'set break count...' action: [|s| s := UIManager default request: 'break count (dec)'. s notEmpty ifTrue: [breakCount := Integer readFrom: s readStream]]; add: 'set break selector...' action: [|s| s := UIManager default request: 'break selector'. s notEmpty ifTrue: [self setBreakSelector: s]]; add: 'set break block...' action: [|s| s := UIManager default request: 'break selector'. s notEmpty ifTrue: [self setBreakBlockFromString: s]]; add: (printBytecodeAtEachStep ifTrue: ['no print bytecode each bytecode'] ifFalse: ['print bytecode each bytecode']) action: [self ensureDebugAtEachStepBlock. printBytecodeAtEachStep := printBytecodeAtEachStep not]; add: (printFrameAtEachStep ifTrue: ['no print frame each bytecode'] ifFalse: ['print frame each bytecode']) action: [self ensureDebugAtEachStepBlock. printFrameAtEachStep := printFrameAtEachStep not]. ^aMenuMorph! Item was changed: ----- Method: Spur32BitMMLECoSimulator>>longAt:put: (in category 'memory access') ----- longAt: byteAddress put: a32BitValue "Note: Adjusted for Smalltalk's 1-based array indexing." + "(byteAddress = 16r32F644 and: [a32BitValue = 16r78FFB0]) ifTrue: - "(byteAddress = 16r15FF7A8 and: [a32BitValue = 16r19D09D0]) ifTrue: [self halt]." byteAddress \\ 4 ~= 0 ifTrue: [self unalignedAccessError]. ^memory at: byteAddress // 4 + 1 put: a32BitValue! Item was changed: ----- Method: SpurCircularBuffer>>reverseDo: (in category 'enumerating') ----- reverseDo: aBlock | ptr | last >= start ifTrue: [ptr := last. [self assert: (first <= last ifTrue: [first <= ptr and: [ptr <= last]] + ifFalse: [(start <= ptr and: [ptr <= last]) or: [first <= ptr and: [ptr <= limit]]]). - ifFalse: [(start <= ptr and: [ptr <= last]) or: [first <= ptr and: [ptr < limit]]]). aBlock value: (manager longAt: ptr). ptr = first ifTrue: [^nil]. (ptr := ptr - manager wordSize) < start ifTrue: [ptr := limit]] repeat]. ^nil! Item was changed: ----- Method: SpurMemoryManager>>addFreeSubTree: (in category 'free space') ----- addFreeSubTree: freeTree "Add a freeChunk sub tree back into the large free chunk tree. This is for allocateOldSpaceChunkOf[Exactly]Bytes:[suchThat:]." | bytesInArg treeNode bytesInNode subNode | "N.B. *can't* use numSlotsOfAny: because of rounding up of odd slots and/or step in size at 1032 bytes in 32-bits or 2048 bytes in 64-bits." + self assert: (self isFreeObject: freeTree). bytesInArg := self bytesInObject: freeTree. self assert: bytesInArg / (self allocationUnit / self wordSize) >= self numFreeLists. treeNode := freeLists at: 0. self assert: treeNode ~= 0. [bytesInNode := self bytesInObject: treeNode. self assert: bytesInArg ~= bytesInNode. bytesInNode > bytesInArg ifTrue: [subNode := self fetchPointer: self freeChunkSmallerIndex ofFreeChunk: treeNode. subNode = 0 ifTrue: [self storePointer: self freeChunkSmallerIndex ofFreeChunk: treeNode withValue: freeTree. self storePointer: self freeChunkParentIndex ofFreeChunk: freeTree withValue: treeNode. ^self]] ifFalse: [subNode := self fetchPointer: self freeChunkLargerIndex ofFreeChunk: treeNode. subNode = 0 ifTrue: [self storePointer: self freeChunkLargerIndex ofFreeChunk: treeNode withValue: freeTree. self storePointer: self freeChunkParentIndex ofFreeChunk: freeTree withValue: treeNode. ^self]]. treeNode := subNode] repeat! Item was changed: ----- Method: SpurMemoryManager>>addToFreeTree:bytes: (in category 'free space') ----- addToFreeTree: freeChunk bytes: chunkBytes "Add freeChunk to the large free chunk tree. For the benefit of sortedFreeObject:, answer the treeNode it is added to, if it is added to the next list of a freeTreeNode, otherwise answer 0." | childBytes parent child | + self assert: (self isFreeObject: freeChunk). self assert: chunkBytes = (self bytesInObject: freeChunk). self assert: chunkBytes / self allocationUnit >= self numFreeLists. self storePointer: self freeChunkNextIndex ofFreeChunk: freeChunk withValue: 0; storePointer: self freeChunkParentIndex ofFreeChunk: freeChunk withValue: 0; storePointer: self freeChunkSmallerIndex ofFreeChunk: freeChunk withValue: 0; storePointer: self freeChunkLargerIndex ofFreeChunk: freeChunk withValue: 0. "Large chunk list organized as a tree, each node of which is a list of chunks of the same size. Beneath the node are smaller and larger blocks." parent := 0. child := freeLists at: 0. [child ~= 0] whileTrue: [childBytes := self bytesInObject: child. childBytes = chunkBytes ifTrue: "size match; add to list at node." [self storePointer: self freeChunkNextIndex ofFreeChunk: freeChunk withValue: (self fetchPointer: self freeChunkNextIndex ofObject: child); storePointer: self freeChunkNextIndex ofFreeChunk: child withValue: freeChunk. ^child]. "walk down the tree" parent := child. child := self fetchPointer: (childBytes > chunkBytes ifTrue: [self freeChunkSmallerIndex] ifFalse: [self freeChunkLargerIndex]) ofFreeChunk: child]. parent = 0 ifTrue: [self assert: (freeLists at: 0) = 0. freeLists at: 0 put: freeChunk. freeListsMask := freeListsMask bitOr: 1. ^0]. self assert: (freeListsMask anyMask: 1). "insert in tree" self storePointer: self freeChunkParentIndex ofFreeChunk: freeChunk withValue: parent. self storePointer: (childBytes > chunkBytes ifTrue: [self freeChunkSmallerIndex] ifFalse: [self freeChunkLargerIndex]) ofFreeChunk: parent withValue: freeChunk. ^0! Item was changed: ----- Method: SpurMemoryManager>>compact (in category 'compaction') ----- compact + "We'd like to use exact fit followed by best fit, but best-fit is complex to implement + and potentially expensive. So just use exactFit followed, if necessary, by first-fit." + self exactFitCompact. + highestObjects usedSize > 0 ifTrue: + [self firstFitCompact]! - "We'd like to use exact fit followed by best fit. But in practice exact fit doesn't move - many objects (it does in artificial contexts such as the image bootstrap, but not in - use of a real system). bestFit is potentially worth-while but takes effort to code. - For now we just use fist-fit." - ^self firstFitCompact! Item was changed: ----- Method: SpurMemoryManager>>exactFitCompact (in category 'compaction') ----- exactFitCompact "Compact all of memory above firstFreeChunk using exact-fit, assuming free space is sorted and that as many of the the highest objects as will fit are recorded in highestObjects. Don't move pinned objects. Note that we don't actually move; we merely copy and forward. Eliminating forwarders will be done in a final pass. Leave the objects that don't fit exactly (the misfits), and hence aren't moved, in highestObjects." <inline: false> | misfits first nfits nmiss nHighest nMisses savedLimit | <var: #misfits type: #usqInt> self checkFreeSpace. totalFreeOldSpace = 0 ifTrue: [^self]. highestObjects isEmpty ifTrue: [^self]. nfits := nmiss := 0. misfits := highestObjects last + self wordSize. [statCompactPassCount := statCompactPassCount + 1. highestObjects from: misfits - self wordSize reverseDo: [:o| | b | + (self oop: o isGreaterThan: firstFreeChunk) ifFalse: + [highestObjects first: misfits. + coInterpreter print: 'exactFitCompact fits: '; printNum: nfits; print: ' misfits: '; printNum: nmiss; cr. + ^self]. - self assert: (self oop: o isGreaterThan: firstFreeChunk). ((self isForwarded: o) or: [self isPinned: o]) ifFalse: [b := self bytesInObject: o. (self allocateOldSpaceChunkOfExactlyBytes: b suchThat: [:f| f < o]) ifNil: [nmiss := nmiss + 1. misfits := misfits - self wordSize. misfits < highestObjects start ifTrue: [misfits := highestObjects limit - self wordSize]. self longAt: misfits put: o] ifNotNil: [:f| nfits := nfits + 1. self copyAndForward: o withBytes: b toFreeChunk: f]]]. self checkFreeSpace. "now highestObjects contains only misfits, if any, from misfits to last. set first to first failure and refill buffer. next cycle will add more misfits. give up on exact-fit when half of the highest objects fail to fit." first := self longAt: highestObjects first. self assert: (self oop: first isGreaterThan: firstFreeChunk). nHighest := highestObjects usedSize. highestObjects first: misfits. nMisses := highestObjects usedSize. nMisses > (nHighest // 2) ifTrue: [coInterpreter print: 'exactFitCompact fits: '; printNum: nfits; print: ' misfits: '; printNum: nmiss; cr. ^self]. self findFirstFreeChunkPostCompactionPass. savedLimit := self moveMisfitsToTopOfHighestObjects: misfits. self fillHighestObjectsWithMovableObjectsFrom: firstFreeChunk upTo: first. misfits := self moveMisfitsInHighestObjectsBack: savedLimit. highestObjects usedSize > 0] whileTrue! Item was changed: ----- Method: SpurMemoryManager>>freeUnmarkedObjectsAndSortAndCoalesceFreeSpace (in category 'gc - global') ----- freeUnmarkedObjectsAndSortAndCoalesceFreeSpace "Sweep all of old space, freeing unmarked objects, coalescing free chunks, and sorting free space. Small free chunks are sorted in address order on each small list head. Large free chunks are sorted on the sortedFreeChunks list. Record as many of the highest objects as there is room for in highestObjects, a circular buffer, for the use of exactFitCompact. Use unused eden space for highestObjects. If highestObjects does not wrap, store 0 at highestObjects last. Record the lowest free object in firstFreeChunk. Let the segmentManager mark which segments contain pinned objects via notePinned:." | lastLargeFree lastHighest highestObjectsWraps sortedFreeChunks | <var: #lastHighest type: #usqInt> self checkFreeSpace. scavenger forgetUnmarkedRememberedObjects. segmentManager prepareForGlobalSweep."for notePinned:" "for sorting free space throw away the list heads, rebuilding them for small free chunks below." self resetFreeListHeads. highestObjects initializeStart: freeStart limit: scavenger eden limit. + lastHighest := highestObjects start - self wordSize. "a.k.a. freeStart - wordSize" - lastHighest := highestObjects last "a.k.a. freeStart - wordSize". highestObjectsWraps := 0. self assert: highestObjects limit - highestObjects start // self wordSize >= 1024. firstFreeChunk := sortedFreeChunks := lastLargeFree := 0. "Note that if we were truly striving for performance we could split the scan into two phases, one up to the first free object and one after, which would remove the need to test firstFreeChunk when filling highestObjects." self allOldSpaceEntitiesForCoalescingDo: [:o| (self isMarked: o) ifTrue: "forwarders should have been followed in markAndTrace:" [self assert: (self isForwarded: o) not. self setIsMarkedOf: o to: false. "this will unmark bridges. undo the damage in notePinned:" (self isPinned: o) ifTrue: [segmentManager notePinned: o]. firstFreeChunk ~= 0 ifTrue: [false "conceptually...: " ifTrue: [highestObjects addLast: o] ifFalse: "but we inline so we can use the local lastHighest" [(lastHighest := lastHighest + self wordSize) >= highestObjects limit ifTrue: + [highestObjectsWraps := highestObjectsWraps + 1. + lastHighest := highestObjects start]. - [highestObjectsWraps := highestObjectsWraps + 1]. self longAt: lastHighest put: o]]] ifFalse: "unmarked; two cases, an unreachable object or a free chunk." [| here limit next | self assert: (self isRemembered: o) not. "scavenger should have cleared this above" here := o. limit := endOfMemory - self bridgeSize. next := self objectAfter: here limit: limit. [next = limit or: [self isMarked: next]] whileFalse: "coalescing; rare case" [self assert: (self isRemembered: o) not. statCoalesces := statCoalesces + 1. here := self coalesce: here and: next. next := self objectAfter: here limit: limit]. - self setFree: here. firstFreeChunk = 0 ifTrue: [firstFreeChunk := here]. (self isLargeFreeObject: here) ifTrue: + [self setFree: here. + lastLargeFree = 0 + ifTrue: [sortedFreeChunks := lastLargeFree := here] - [lastLargeFree = 0 - ifTrue: [sortedFreeChunks := here] ifFalse: + [self storePointer: self freeChunkNextAddressIndex + ofFreeChunk: lastLargeFree + withValue: here]. - [self setFree: here. - self storePointer: self freeChunkNextAddressIndex ofFreeChunk: lastLargeFree withValue: here]. lastLargeFree := here] ifFalse: [self freeSmallObject: here]]]. highestObjects last: lastHighest. highestObjectsWraps ~= 0 ifTrue: [highestObjects first: (lastHighest + self wordSize >= highestObjects limit ifTrue: [highestObjects start] ifFalse: [lastHighest + self wordSize])]. lastLargeFree ~= 0 ifTrue: [self storePointer: self freeChunkNextAddressIndex ofFreeChunk: lastLargeFree withValue: 0]. totalFreeOldSpace := self reverseSmallListHeads. totalFreeOldSpace := totalFreeOldSpace + (self rebuildFreeTreeFrom: sortedFreeChunks). self checkFreeSpace. self touch: highestObjectsWraps!

1 0

VM Maker: VMMaker.oscog-eem.522.mcz
by commits＠source.squeak.org 26 Nov '13

26 Nov '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.522.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.522 Author: eem Time: 25 November 2013, 6:23:21.686 pm UUID: 4fd1d094-9a41-41df-b776-1989665951d5 Ancestors: VMMaker.oscog-eem.521 Fix evolutiuon of send site linked to closed PIC into site linked to open PIC to enforce invariant that cache tags of sites linked to open PICs are selectors; this for checkIfValidObjectRef:pc:cogMethod:'s cache tag checks. Fix caxche tag checks in checkValidObjectReferencesInClosedPIC: for Spur via CogObjectRepresentation>>inlineCacheTagsMayBeObjects. Fix compilation of Spur's cogit.c by marking wordSize <api> now that wordSize is not handled specially by CCodeGenerator. Add some subclassResponsibilities to CogObjectRepresentation. =============== Diff against VMMaker.oscog-eem.521 =============== Item was added: + ----- Method: CogObjectRepresentation>>canLinkToYoungClasses (in category 'in-line cacheing') ----- + canLinkToYoungClasses + ^self subclassResponsibility! Item was added: + ----- Method: CogObjectRepresentation>>inlineCacheTagForInstance: (in category 'in-line cacheing') ----- + inlineCacheTagForInstance: oop + "c.f. getInlineCacheClassTagFrom:into:" + ^self subclassResponsibility! Item was added: + ----- Method: CogObjectRepresentation>>inlineCacheTagIsYoung: (in category 'in-line cacheing') ----- + inlineCacheTagIsYoung: cacheTag + ^self subclassResponsibility! Item was added: + ----- Method: CogObjectRepresentation>>inlineCacheTagsMayBeObjects (in category 'in-line cacheing') ----- + inlineCacheTagsMayBeObjects + ^self subclassResponsibility! Item was added: + ----- Method: CogObjectRepresentationForSpur>>inlineCacheTagsMayBeObjects (in category 'in-line cacheing') ----- + inlineCacheTagsMayBeObjects + ^false! Item was added: + ----- Method: CogObjectRepresentationForSqueakV3>>inlineCacheTagsMayBeObjects (in category 'in-line cacheing') ----- + inlineCacheTagsMayBeObjects + ^true! Item was changed: ----- Method: Cogit>>ceSICMiss: (in category 'in-line cacheing') ----- ceSICMiss: receiver "An in-line cache check in a method has failed. The failing entry check has jumped to the ceMethodAbort abort call at the start of the method which has called this routine. If possible allocate a closed PIC for the current and existing classes. The stack looks like: receiver args sender return address sp=> ceMethodAbort call return address So we can find the method that did the failing entry check at ceMethodAbort call return address - missOffset and we can find the send site from the outer return address." <api> | pic innerReturn outerReturn entryPoint targetMethod newTargetMethodOrNil errorSelectorOrNil cacheTag extent result | <var: #pic type: #'CogMethod *'> <var: #targetMethod type: #'CogMethod *'> "Whether we can relink to a PIC or not we need to pop off the inner return and identify the target method." innerReturn := coInterpreter popStack. targetMethod := self cCoerceSimple: innerReturn - missOffset to: #'CogMethod *'. outerReturn := coInterpreter stackTop. self assert: (outerReturn between: methodZoneBase and: methodZone freeStart). entryPoint := backEnd callTargetFromReturnAddress: outerReturn. self assert: targetMethod selector ~= objectMemory nilObject. self cppIf: NewspeakVM ifTrue: [self assert: (targetMethod asInteger + cmEntryOffset = entryPoint or: [targetMethod asInteger + cmDynSuperEntryOffset = entryPoint]). "Avoid the effort of implementing PICs for the relatively low dynamic frequency dynamic super send and simply rebind the send site." targetMethod asInteger + cmDynSuperEntryOffset = entryPoint ifTrue: [^coInterpreter ceDynamicSuperSend: targetMethod selector to: receiver numArgs: targetMethod cmNumArgs]]. self assert: targetMethod asInteger + cmEntryOffset = entryPoint. self lookup: targetMethod selector for: receiver methodAndErrorSelectorInto: [:method :errsel| newTargetMethodOrNil := method. errorSelectorOrNil := errsel]. "We assume lookupAndCog:for: will *not* reclaim the method zone" self assert: outerReturn = coInterpreter stackTop. cacheTag := objectRepresentation inlineCacheTagForInstance: receiver. ((errorSelectorOrNil notNil and: [errorSelectorOrNil ~= SelectorDoesNotUnderstand]) or: [(objectRepresentation inlineCacheTagIsYoung: cacheTag) or: [newTargetMethodOrNil isNil or: [objectMemory isYoung: newTargetMethodOrNil]]]) ifTrue: [result := self patchToOpenPICFor: targetMethod selector numArgs: targetMethod cmNumArgs receiver: receiver. self assert: result not. "If patchToOpenPICFor:.. returns we're out of code memory" ^coInterpreter ceSendFromInLineCacheMiss: targetMethod]. "See if an Open PIC is already available." pic := methodZone openPICWithSelector: targetMethod selector. pic isNil ifTrue: ["otherwise attempt to create a closed PIC for the two cases." pic := self cogPICSelector: targetMethod selector numArgs: targetMethod cmNumArgs Case0Method: targetMethod Case1Method: newTargetMethodOrNil tag: cacheTag isMNUCase: errorSelectorOrNil = SelectorDoesNotUnderstand. (pic asInteger between: MaxNegativeErrorCode and: -1) ifTrue: ["For some reason the PIC couldn't be generated, most likely a lack of code memory. Continue as if this is an unlinked send." pic asInteger = InsufficientCodeSpace ifTrue: [coInterpreter callForCogCompiledCodeCompaction]. ^coInterpreter ceSendFromInLineCacheMiss: targetMethod]. processor flushICacheFrom: pic asInteger to: pic asInteger + closedPICSize]. + "Relink the send site to the pic. If to an open PIC then reset the cache tag to the selector, + for the benefit of the cacheTag assert check in checkIfValidObjectRef:pc:cogMethod:." + extent := pic cmType = CMOpenPIC + ifTrue: + [backEnd + rewriteInlineCacheAt: outerReturn + tag: targetMethod selector + target: pic asInteger + cmEntryOffset] + ifFalse: + [backEnd + rewriteCallAt: outerReturn + target: pic asInteger + cmEntryOffset]. - "Relink the send site to the pic." - extent := backEnd - rewriteCallAt: outerReturn - target: pic asInteger + cmEntryOffset. processor flushICacheFrom: outerReturn - 1 - extent to: outerReturn - 1. "Jump back into the pic at its entry in case this is an MNU (newTargetMethodOrNil is nil)" coInterpreter executeCogMethodFromLinkedSend: pic withReceiver: receiver andCacheTag: (backEnd inlineCacheTagAt: outerReturn). "NOTREACHED" ^nil! Item was changed: ----- Method: Cogit>>checkIfValidObjectRef:pc:cogMethod: (in category 'garbage collection') ----- checkIfValidObjectRef: annotation pc: mcpc cogMethod: cogMethod <var: #mcpc type: #'char *'> <var: #sendTable type: #'sqInt *'> annotation = IsObjectReference ifTrue: [| literal | literal := backEnd literalBeforeFollowingAddress: mcpc asInteger. (objectRepresentation checkValidObjectReference: literal) ifFalse: [coInterpreter print: 'object ref leak in CM '; printHex: cogMethod asInteger; print: ' @ '; printHex: mcpc asInteger; cr. ^1]]. (self isSendAnnotation: annotation) ifTrue: [| entryPoint selectorOrCacheTag offset sendTable | entryPoint := backEnd callTargetFromReturnAddress: mcpc asInteger. self offsetAndSendTableFor: entryPoint annotation: annotation into: [:off :table| offset := off. sendTable := table]. selectorOrCacheTag := backEnd inlineCacheTagAt: mcpc asInteger. (entryPoint > methodZoneBase and: [offset ~= cmNoCheckEntryOffset + and: [(self cCoerceSimple: entryPoint - offset to: #'CogMethod *') cmType ~= CMOpenPIC]]) - and: [(self cCoerceSimple: entryPoint + offset to: #'CogMethod *') cmType ~= CMOpenPIC - or: [(objectRepresentation couldBeObject: selectorOrCacheTag) not]]]) ifTrue: "linked non-super send, cacheTag is a cacheTag" [(objectRepresentation checkValidInlineCacheTag: selectorOrCacheTag) ifFalse: [coInterpreter print: 'cache tag leak in CM '; printHex: cogMethod asInteger; print: ' @ '; printHex: mcpc asInteger; cr. ^1]] ifFalse: "unlinked send or super send; cacheTag is a selector" [(objectRepresentation checkValidObjectReference: selectorOrCacheTag) ifFalse: [coInterpreter print: 'selector leak in CM '; printHex: cogMethod asInteger; print: ' @ '; printHex: mcpc asInteger; cr. ^1]]]. ^0 "keep scanning"! Item was changed: ----- Method: Cogit>>checkValidObjectReferencesInClosedPIC: (in category 'garbage collection') ----- checkValidObjectReferencesInClosedPIC: cPIC <var: #cPIC type: #'CogMethod *'> | ok pc | ok := true. pc := cPIC asInteger + firstCPICCaseOffset. (self checkMaybeObjRefAt: pc - backEnd jumpLongByteSize) ifFalse: [self print: 'object leak in CPIC '; printHex: cPIC asInteger; print: ' @ '; printHex: pc - backEnd jumpLongByteSize; cr. ok := false]. pc := pc + cPICCaseSize. 2 to: cPIC cPICNumCases do: [:i| + objectRepresentation inlineCacheTagsMayBeObjects ifTrue: + [(self checkMaybeObjRefAt: pc - backEnd jumpLongConditionalByteSize - backEnd loadLiteralByteSize) ifFalse: + [self print: 'object leak in CPIC '; printHex: cPIC asInteger; + print: ' @ '; printHex: pc - backEnd jumpLongConditionalByteSize - backEnd loadLiteralByteSize; cr. + ok := false]]. - (self checkMaybeObjRefAt: pc - backEnd jumpLongConditionalByteSize - backEnd loadLiteralByteSize) ifFalse: - [self print: 'object leak in CPIC '; printHex: cPIC asInteger; - print: ' @ '; printHex: pc - backEnd jumpLongConditionalByteSize - backEnd loadLiteralByteSize; cr. - ok := false]. (self checkMaybeObjRefAt: pc - backEnd jumpLongConditionalByteSize) ifFalse: [self print: 'object leak in CPIC '; printHex: cPIC asInteger; print: ' @ '; printHex: pc - backEnd jumpLongConditionalByteSize; cr. ok := false]. pc := pc + cPICCaseSize]. ^ok! Item was changed: ----- Method: Spur32BitMemoryManager>>wordSize (in category 'word size') ----- wordSize + <api> + <cmacro: '() 4'> ^4! Item was changed: ----- Method: Spur64BitMemoryManager>>wordSize (in category 'word size') ----- wordSize + <cmacro: '() 8'> ^8!

1 0

VM Maker: Cog-eem.124.mcz
by commits＠source.squeak.org 26 Nov '13

26 Nov '13

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.124.mcz ==================== Summary ==================== Name: Cog-eem.124 Author: eem Time: 25 November 2013, 4:50:58.945 pm UUID: cbd92eb3-1bf4-41e8-a3ea-11a30a9b388a Ancestors: Cog-eem.123 Remove the new cog zone anywhere execution primitives from the processor plugins. The plugin is simpler without them. =============== Diff against Cog-eem.123 =============== Item was removed: - ----- Method: BochsIA32Alien>>primitiveRunInMemory:minimumAddress:executableAndReadOnlyFrom:to: (in category 'primitives') ----- - primitiveRunInMemory: memoryArray "<Bitmap|ByteArray>" - minimumAddress: minimumAddress "<Integer>" - executableAndReadOnlyFrom: minExecAndReadOnlyAddress "<Integer>" - to: maxExecAndReadOnlyAddress "<Integer>" - "Run the receiver using the argument as the store. Origin the argument at 0. i.e. the first byte of the - memoryArray is address 0. Make addresses below minimumAddress illegal. Convert out-of-range - calls, jumps and memory read/writes into ProcessorSimulationTrap signals." - <primitive: 'primitiveRunInMemoryMinimumAddressERFromTo' module: 'BochsIA32Plugin' error: ec> - ^ec == #'inappropriate operation' - ifTrue: [self handleExecutionPrimitiveFailureIn: memoryArray - minimumAddress: minimumAddress] - ifFalse: [self reportPrimitiveFailure] - - "self printRegistersOn: Transcript"! Item was removed: - ----- Method: BochsIA32Alien>>primitiveSingleStepInMemory:minimumAddress:executableAndReadOnlyFrom:to: (in category 'primitives') ----- - primitiveSingleStepInMemory: memoryArray "<Bitmap|ByteArray>" - minimumAddress: minimumAddress "<Integer>" - executableAndReadOnlyFrom: minExecAndReadOnlyAddress "<Integer>" - to: maxExecAndReadOnlyAddress "<Integer>" - "Single-step the receiver using the argument as the store. Origin the argument at 0. i.e. the first byte of the - memoryArray is address 0. Make addresses below minimumAddress illegal. Convert out-of-range - calls, jumps and memory read/writes into ProcessorSimulationTrap signals." - <primitive: 'primitiveSingleStepInMemoryMinimumAddressERFromTo' module: 'BochsIA32Plugin' error: ec> - ^ec == #'inappropriate operation' - ifTrue: [self handleExecutionPrimitiveFailureIn: memoryArray - minimumAddress: minimumAddress] - ifFalse: [self reportPrimitiveFailure] - - "self printRegistersOn: Transcript"! Item was removed: - ----- Method: BochsIA32Plugin>>primitiveRunInMemory:minimumAddress:executableAndReadOnlyFrom:to: (in category 'primitives') ----- - "cpuAlien <BochsIA32Alien>" primitiveRunInMemory: memory "<Bitmap|ByteArray|WordArray>" minimumAddress: minAddress "<Integer>" executableAndReadOnlyFrom: minExecAndReadOnlyAddress "<Integer>" to: maxExecAndReadOnlyAddress "<Integer>" - "Run the cpu using the first argument as the memory and the following arguments defining valid addresses, running until it halts or hits an exception." - | cpuAlien cpu maybeErr | - <var: #cpu type: #'void *'> - cpuAlien := self primitive: #primitiveRunInMemoryMinimumAddressERFromTo - parameters: #(WordsOrBytes Unsigned Unsigned Unsigned) - receiver: #Oop. - (cpu := self startOfData: cpuAlien) = 0 ifTrue: - [^interpreterProxy primitiveFailFor: PrimErrBadReceiver]. - prevInterruptCheckChain := interpreterProxy setInterruptCheckChain: #forceStopOnInterrupt asSymbol. - prevInterruptCheckChain = #forceStopOnInterrupt asSymbol ifTrue: - [prevInterruptCheckChain = 0]. - maybeErr := self runCPU: cpu - In: memory - Size: (interpreterProxy byteSizeOf: memory cPtrAsOop) - MinAddress: minAddress - EROFrom: minExecAndReadOnlyAddress - To: maxExecAndReadOnlyAddress. - interpreterProxy setInterruptCheckChain: prevInterruptCheckChain. - maybeErr ~= 0 ifTrue: - [^interpreterProxy primitiveFailFor: PrimErrInappropriate]. - ^cpuAlien! Item was removed: - ----- Method: BochsIA32Plugin>>primitiveSingleStepInMemory:minimumAddress:executableAndReadOnlyFrom:to: (in category 'primitives') ----- - "cpuAlien <BochsIA32Alien>" primitiveSingleStepInMemory: memory "<Bitmap|ByteArray|WordArray>" minimumAddress: minAddress "<Integer>" executableAndReadOnlyFrom: minExecAndReadOnlyAddress "<Integer>" to: maxExecAndReadOnlyAddress "<Integer>" - "Single-step the cpu using the first argument as the memory and the following arguments defining valid addresses, running until it halts or hits an exception." - | cpuAlien cpu maybeErr | - <var: #cpu type: #'void *'> - cpuAlien := self primitive: #primitiveSingleStepInMemoryMinimumAddressERFromTo - parameters: #(WordsOrBytes Unsigned Unsigned Unsigned) - receiver: #Oop. - (cpu := self startOfData: cpuAlien) = 0 ifTrue: - [^interpreterProxy primitiveFailFor: PrimErrBadReceiver]. - maybeErr := self singleStepCPU: cpu - In: memory - Size: (interpreterProxy byteSizeOf: memory cPtrAsOop) - MinAddress: minAddress - EROFrom: minExecAndReadOnlyAddress - To: maxExecAndReadOnlyAddress. - interpreterProxy setInterruptCheckChain: prevInterruptCheckChain. - maybeErr ~= 0 ifTrue: - [^interpreterProxy primitiveFailFor: PrimErrInappropriate]. - ^cpuAlien! Item was removed: - ----- Method: CogProcessorAlien>>runInMemory:minimumAddress:executableAndReadOnlyFrom:to: (in category 'execution') ----- - runInMemory: aMemory minimumAddress: minimumAddress executableAndReadOnlyFrom: minExecAndReadOnlyAddress to: maxExecAndReadOnlyAddress - | result | - result := self primitiveRunInMemory: aMemory - minimumAddress: minimumAddress - executableAndReadOnlyFrom: minExecAndReadOnlyAddress - to: maxExecAndReadOnlyAddress. - result ~~ self ifTrue: - [self error: 'eek!!']! Item was removed: - ----- Method: CogProcessorAlien>>singleStepInMemory:minimumAddress:executableAndReadOnlyFrom:to: (in category 'execution') ----- - singleStepInMemory: aMemory minimumAddress: minimumAddress executableAndReadOnlyFrom: minExecAndReadOnlyAddress to: maxExecAndReadOnlyAddress - | result | - result := self primitiveSingleStepInMemory: aMemory - minimumAddress: minimumAddress - executableAndReadOnlyFrom: minExecAndReadOnlyAddress - to: maxExecAndReadOnlyAddress. - result ~~ self ifTrue: - [self error: 'eek!!']! Item was removed: - ----- Method: GdbARMAlien>>primitiveRunInMemory:minimumAddress:executableAndReadOnlyFrom:to: (in category 'primitives') ----- - primitiveRunInMemory: memoryArray "<Bitmap|ByteArray>" - minimumAddress: minimumAddress "<Integer>" - executableAndReadOnlyFrom: minExecAndReadOnlyAddress "<Integer>" - to: maxExecAndReadOnlyAddress "<Integer>" - "Run the receiver using the argument as the store. Origin the argument at 0. i.e. the first byte of the - memoryArray is address 0. Make addresses below minimumAddress illegal. Convert out-of-range - calls, jumps and memory read/writes into ProcessorSimulationTrap signals." - <primitive: 'primitiveRunInMemoryMinimumAddressERFromTo' module: 'GdbARMPlugin' error: ec> - ^ec == #'inappropriate operation' - ifTrue: [self handleExecutionPrimitiveFailureIn: memoryArray - minimumAddress: minimumAddress] - ifFalse: [self reportPrimitiveFailure] - - "self printRegistersOn: Transcript"! Item was removed: - ----- Method: GdbARMAlien>>primitiveSingleStepInMemory:minimumAddress:executableAndReadOnlyFrom:to: (in category 'primitives') ----- - primitiveSingleStepInMemory: memoryArray "<Bitmap|ByteArray>" - minimumAddress: minimumAddress "<Integer>" - executableAndReadOnlyFrom: minExecAndReadOnlyAddress "<Integer>" - to: maxExecAndReadOnlyAddress "<Integer>" - "Single-step the receiver using the argument as the store. Origin the argument at 0. i.e. the first byte of the - memoryArray is address 0. Make addresses below minimumAddress illegal. Convert out-of-range - calls, jumps and memory read/writes into ProcessorSimulationTrap signals." - <primitive: 'primitiveSingleStepInMemoryMinimumAddressERFromTo' module: 'GdbARMPlugin' error: ec> - ^ec == #'inappropriate operation' - ifTrue: [self handleExecutionPrimitiveFailureIn: memoryArray - minimumAddress: minimumAddress] - ifFalse: [self reportPrimitiveFailure] - - "self printRegistersOn: Transcript"! Item was removed: - ----- Method: GdbARMPlugin>>primitiveRunInMemory:minimumAddress:executableAndReadOnlyFrom:to: (in category 'primitives') ----- - "cpuAlien <GdbARMAlien>" primitiveRunInMemory: memory "<Bitmap|ByteArray|WordArray>" minimumAddress: minAddress "<Integer>" executableAndReadOnlyFrom: minExecAndReadOnlyAddress "<Integer>" to: maxExecAndReadOnlyAddress "<Integer>" - "Run the cpu using the first argument as the memory and the following arguments defining valid addresses, running until it halts or hits an exception." - | cpuAlien cpu maybeErr | - <var: #cpu type: #'void *'> - cpuAlien := self primitive: #primitiveRunInMemoryMinimumAddressERFromTo - parameters: #(WordsOrBytes Unsigned Unsigned Unsigned) - receiver: #Oop. - (cpu := self startOfData: cpuAlien) = 0 ifTrue: - [^interpreterProxy primitiveFailFor: PrimErrBadReceiver]. - prevInterruptCheckChain := interpreterProxy setInterruptCheckChain: #forceStopOnInterrupt asSymbol. - prevInterruptCheckChain = #forceStopOnInterrupt asSymbol ifTrue: - [prevInterruptCheckChain = 0]. - maybeErr := self runCPU: cpu - In: memory - Size: (interpreterProxy byteSizeOf: memory cPtrAsOop) - MinAddress: minAddress - EROFrom: minExecAndReadOnlyAddress - To: maxExecAndReadOnlyAddress. - interpreterProxy setInterruptCheckChain: prevInterruptCheckChain. - maybeErr ~= 0 ifTrue: - [^interpreterProxy primitiveFailFor: PrimErrInappropriate]. - ^cpuAlien! Item was removed: - ----- Method: GdbARMPlugin>>primitiveSingleStepInMemory:minimumAddress:executableAndReadOnlyFrom:to: (in category 'primitives') ----- - "cpuAlien <GdbARMAlien>" primitiveSingleStepInMemory: memory "<Bitmap|ByteArray|WordArray>" minimumAddress: minAddress "<Integer>" executableAndReadOnlyFrom: minExecAndReadOnlyAddress "<Integer>" to: maxExecAndReadOnlyAddress "<Integer>" - "Single-step the cpu using the first argument as the memory and the following arguments defining valid addresses, running until it halts or hits an exception." - | cpuAlien cpu maybeErr | - <var: #cpu type: #'void *'> - cpuAlien := self primitive: #primitiveSingleStepInMemoryMinimumAddressERFromTo - parameters: #(WordsOrBytes Unsigned Unsigned Unsigned) - receiver: #Oop. - (cpu := self startOfData: cpuAlien) = 0 ifTrue: - [^interpreterProxy primitiveFailFor: PrimErrBadReceiver]. - maybeErr := self singleStepCPU: cpu - In: memory - Size: (interpreterProxy byteSizeOf: memory cPtrAsOop) - MinAddress: minAddress - EROFrom: minExecAndReadOnlyAddress - To: maxExecAndReadOnlyAddress. - interpreterProxy setInterruptCheckChain: prevInterruptCheckChain. - maybeErr ~= 0 ifTrue: - [^interpreterProxy primitiveFailFor: PrimErrInappropriate]. - ^cpuAlien!

1 0

VM Maker: VMMaker.oscog-eem.521.mcz
by commits＠source.squeak.org 26 Nov '13

26 Nov '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.521.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.521 Author: eem Time: 25 November 2013, 4:43:55.229 pm UUID: 083a987f-b44f-4765-a2fb-48b2fe95d0f0 Ancestors: VMMaker.oscog-eem.520 Simplify the setHeapBase:memoryLimit:endOfMemory: logic in CoInterpreter>>readImageFromFile:HeapSize:StartingAt:. Revers eth eill=considered decision to output wordSize as BytesPerWord in VMMaker.oscog-eem.363. Fix a compilation warning in followForwardingPointersInStackZone:. =============== Diff against VMMaker.oscog-eem.520 =============== Item was changed: ----- Method: CCodeGenerator>>initializeCTranslationDictionary (in category 'C translation') ----- initializeCTranslationDictionary "Initialize the dictionary mapping message names to actions for C code generation." | pairs | translationDict := Dictionary new: 200. pairs := #( #& #generateAnd:on:indent: #| #generateOr:on:indent: #and: #generateSequentialAnd:on:indent: #or: #generateSequentialOr:on:indent: #not #generateNot:on:indent: #+ #generatePlus:on:indent: #- #generateMinus:on:indent: #negated #generateNegated:on:indent: #* #generateTimes:on:indent: #/ #generateDivide:on:indent: #// #generateDivide:on:indent: #\\ #generateModulo:on:indent: #<< #generateShiftLeft:on:indent: #>> #generateShiftRight:on:indent: #min: #generateMin:on:indent: #max: #generateMax:on:indent: #between:and: #generateBetweenAnd:on:indent: #bitAnd: #generateBitAnd:on:indent: #bitOr: #generateBitOr:on:indent: #bitXor: #generateBitXor:on:indent: #bitShift: #generateBitShift:on:indent: #signedBitShift: #generateSignedBitShift:on:indent: #bitInvert32 #generateBitInvert32:on:indent: #bitClear: #generateBitClear:on:indent: #truncateTo: #generateTruncateTo:on:indent: #rounded #generateRounded:on:indent: #< #generateLessThan:on:indent: #<= #generateLessThanOrEqual:on:indent: #= #generateEqual:on:indent: #> #generateGreaterThan:on:indent: #>= #generateGreaterThanOrEqual:on:indent: #~= #generateNotEqual:on:indent: #== #generateEqual:on:indent: #~~ #generateNotEqual:on:indent: #isNil #generateIsNil:on:indent: #notNil #generateNotNil:on:indent: #whileTrue: #generateWhileTrue:on:indent: #whileFalse: #generateWhileFalse:on:indent: #whileTrue #generateDoWhileTrue:on:indent: #whileFalse #generateDoWhileFalse:on:indent: #to:do: #generateToDo:on:indent: #to:by:do: #generateToByDo:on:indent: #repeat #generateRepeat:on:indent: #ifTrue: #generateIfTrue:on:indent: #ifFalse: #generateIfFalse:on:indent: #ifTrue:ifFalse: #generateIfTrueIfFalse:on:indent: #ifFalse:ifTrue: #generateIfFalseIfTrue:on:indent: #ifNotNil: #generateIfNotNil:on:indent: #ifNil: #generateIfNil:on:indent: #ifNotNil:ifNil: #generateIfNotNilIfNil:on:indent: #ifNil:ifNotNil: #generateIfNilIfNotNil:on:indent: #at: #generateAt:on:indent: #at:put: #generateAtPut:on:indent: #basicAt: #generateAt:on:indent: #basicAt:put: #generateAtPut:on:indent: #integerValueOf: #generateIntegerValueOf:on:indent: #integerObjectOf: #generateIntegerObjectOf:on:indent: #isIntegerObject: #generateIsIntegerObject:on:indent: #cCode: #generateInlineCCode:on:indent: #cCode:inSmalltalk: #generateInlineCCode:on:indent: #cPreprocessorDirective: #generateInlineCPreprocessorDirective:on:indent: #cppIf:ifTrue:ifFalse: #generateInlineCppIfElse:on:indent: #cppIf:ifTrue: #generateInlineCppIfElse:on:indent: #cCoerce:to: #generateCCoercion:on:indent: #cCoerceSimple:to: #generateCCoercion:on:indent: #addressOf: #generateAddressOf:on:indent: #addressOf:put: #generateAddressOf:on:indent: #signedIntFromLong #generateSignedIntFromLong:on:indent: #signedIntToLong #generateSignedIntToLong:on:indent: #signedIntFromShort #generateSignedIntFromShort:on:indent: #signedIntToShort #generateSignedIntToShort:on:indent: #preIncrement #generatePreIncrement:on:indent: #preDecrement #generatePreDecrement:on:indent: #inline: #generateInlineDirective:on:indent: #asFloat #generateAsFloat:on:indent: #asInteger #generateAsInteger:on:indent: #asUnsignedInteger #generateAsUnsignedInteger:on:indent: #asLong #generateAsLong:on:indent: #asUnsignedLong #generateAsUnsignedLong:on:indent: #asVoidPointer #generateAsVoidPointer:on:indent: #asSymbol #generateAsSymbol:on:indent: #flag: #generateFlag:on:indent: #anyMask: #generateBitAnd:on:indent: #noMask: #generateNoMask:on:indent: #raisedTo: #generateRaisedTo:on:indent: #touch: #generateTouch:on:indent: #bytesPerWord #generateBytesPerWord:on:indent: - #wordSize #generateBytesPerWord:on:indent: #baseHeaderSize #generateBaseHeaderSize:on:indent: #sharedCodeNamed:inCase: #generateSharedCodeDirective:on:indent: #perform: #generatePerform:on:indent: #perform:with: #generatePerform:on:indent: #perform:with:with: #generatePerform:on:indent: #perform:with:with:with: #generatePerform:on:indent: #perform:with:with:with:with: #generatePerform:on:indent: #perform:with:with:with:with:with: #generatePerform:on:indent: #value #generateValue:on:indent: #value: #generateValue:on:indent: #value:value: #generateValue:on:indent: #shouldNotImplement #generateSmalltalkMetaError:on:indent: #shouldBeImplemented #generateSmalltalkMetaError:on:indent: #subclassResponsibility #generateSmalltalkMetaError:on:indent: ). 1 to: pairs size by: 2 do: [:i | translationDict at: (pairs at: i) put: (pairs at: i + 1)]. pairs := #( #ifTrue: #generateIfTrueAsArgument:on:indent: #ifFalse: #generateIfFalseAsArgument:on:indent: #ifTrue:ifFalse: #generateIfTrueIfFalseAsArgument:on:indent: #ifFalse:ifTrue: #generateIfFalseIfTrueAsArgument:on:indent: #ifNotNil: #generateIfNotNilAsArgument:on:indent: #ifNil: #generateIfNilAsArgument:on:indent: #ifNotNil:ifNil: #generateIfNotNilIfNilAsArgument:on:indent: #ifNil:ifNotNil: #generateIfNilIfNotNilAsArgument:on:indent: #cCode: #generateInlineCCodeAsArgument:on:indent: #cCode:inSmalltalk: #generateInlineCCodeAsArgument:on:indent: #cppIf:ifTrue:ifFalse: #generateInlineCppIfElseAsArgument:on:indent: #cppIf:ifTrue: #generateInlineCppIfElseAsArgument:on:indent: #value #generateValueAsArgument:on:indent: #value: #generateValueAsArgument:on:indent: #value:value: #generateValueAsArgument:on:indent: ). asArgumentTranslationDict := Dictionary new: 8. 1 to: pairs size by: 2 do: [:i | asArgumentTranslationDict at: (pairs at: i) put: (pairs at: i + 1)]. ! Item was changed: ----- Method: CoInterpreter>>followForwardingPointersInStackZone: (in category 'object memory support') ----- followForwardingPointersInStackZone: theBecomeEffectsFlags "Spur's become: is lazy, turning the becommed object into a forwarding object to the other. + The read-barrier is minimised by arranging that forwarding pointers will fail a method cache + probe, since notionally objects' internals are accessed only via sending messages to them, + the exception is primitives that access the internals of the non-receiver argument(s). + To avoid a read barrier on bytecode, literal and inst var fetch we scan the receivers and + methods in the stack zone and follow any forwarded ones. This is of course way cheaper + than scanning all of memory as in the old become." - The read-barrier is minimised by arranging that forwarding pointers will fail a method cache probe, - since notionally objects' internals are accessed only via sending messages to them (the exception - is primitives that access the internals of the non-receiver argument(s). - To avoid a read barrier on bytecode, literal and inst var fetch we scan the receivers and methods - in the stack zone and follow any forwarded ones. This is of course way cheaper than scanning all - of memory as in the old become." | theIPPtr | <inline: false> <var: #thePage type: #'StackPage *'> <var: #theSP type: #'char *'> <var: #theFP type: #'char *'> <var: #callerFP type: #'char *'> <var: #theIPPtr type: #usqInt> (theBecomeEffectsFlags anyMask: BecameCompiledMethodFlag) ifTrue: [(objectMemory isForwarded: method) ifTrue: [theIPPtr := instructionPointer - method. method := objectMemory followForwarded: method. instructionPointer := method + theIPPtr]. (objectMemory isForwarded: newMethod) ifTrue: [newMethod := objectMemory followForwarded: newMethod]]. self assert: stackPage ~= 0. 0 to: numStackPages - 1 do: [:i| | thePage theSP theFP callerFP oop offset | thePage := stackPages stackPageAt: i. thePage isFree ifFalse: [theSP := thePage headSP. theFP := thePage headFP. "Skip the instruction pointer on top of stack of inactive pages." thePage = stackPage ifTrue: [theIPPtr := 0] ifFalse: [theIPPtr := theSP asUnsignedInteger. theSP := theSP + BytesPerWord]. [self assert: (thePage addressIsInPage: theFP). self assert: (theIPPtr = 0 or: [thePage addressIsInPage: theIPPtr asVoidPointer]). + offset := self frameStackedReceiverOffset: theFP. + oop := stackPages longAt: theFP + offset. - offset := theFP + (self frameStackedReceiverOffset: theFP). - oop := stackPages longAt: offset. ((objectMemory isNonImmediate: oop) and: [(objectMemory isForwarded: oop)]) ifTrue: [stackPages + longAt: theFP + offset - longAt: offset put: (objectMemory followForwarded: oop)]. ((self frameHasContext: theFP) and: [(objectMemory isForwarded: (self frameContext: theFP))]) ifTrue: [stackPages longAt: theFP + FoxThisContext put: (objectMemory followForwarded: (self frameContext: theFP))]. (self isMachineCodeFrame: theFP) ifTrue: [oop := stackPages longAt: theFP + FoxIFReceiver. ((objectMemory isNonImmediate: oop) and: [(objectMemory isForwarded: oop)]) ifTrue: [stackPages longAt: theFP + FoxIFReceiver put: (objectMemory followForwarded: oop)]. self assert: (objectMemory isForwarded: (self frameMethodObject: theFP)) not] ifFalse: [oop := stackPages longAt: theFP + FoxIFReceiver. ((objectMemory isNonImmediate: oop) and: [(objectMemory isForwarded: oop)]) ifTrue: [stackPages longAt: theFP + FoxIFReceiver put: (objectMemory followForwarded: oop)]. oop := self frameMethod: theFP. (objectMemory isForwarded: oop) ifTrue: [| delta | delta := (objectMemory followForwarded: oop) - oop. (theIPPtr ~= 0 and: [(stackPages longAt: theIPPtr) > (self frameMethod: theFP)]) ifTrue: [stackPages longAt: theIPPtr put: (stackPages longAt: theIPPtr) + delta]. stackPages longAt: theFP + FoxIFSavedIP put: (stackPages longAt: theFP + FoxIFSavedIP) + delta. stackPages longAt: theFP + FoxMethod put: (objectMemory followForwarded: oop)]]. self followNecessaryForwardingInMethod: (self frameMethod: theFP). (callerFP := self frameCallerFP: theFP) ~= 0] whileTrue: [theIPPtr := (theFP + FoxCallerSavedIP) asUnsignedInteger. theFP := callerFP]]]! Item was changed: ----- Method: CoInterpreter>>readImageFromFile:HeapSize:StartingAt: (in category 'image save/restore') ----- readImageFromFile: f HeapSize: desiredHeapSize StartingAt: imageOffset "Read an image from the given file stream, allocating the given amount of memory to its object heap. Fail if the image has an unknown format or requires more than the given amount of memory." "Details: This method detects when the image was stored on a machine with the opposite byte ordering from this machine and swaps the bytes automatically. Furthermore, it allows the header information to start 512 bytes into the file, since some file transfer programs for the Macintosh apparently prepend a Mac-specific header of this size. Note that this same 512 bytes of prefix area could also be used to store an exec command on Unix systems, allowing one to launch Smalltalk by invoking the image name as a command." "This code is based on C code by Ian Piumarta and Smalltalk code by Tim Rowledge. Many thanks to both of you!!!!" | swapBytes headerStart headerSize dataSize oldBaseAddr minimumMemory heapSize bytesRead bytesToShift firstSegSize hdrNumStackPages hdrEdenBytes hdrCogCodeSize headerFlags hdrMaxExtSemTabSize | <var: #f type: #sqImageFile> <var: #dataSize type: #'size_t'> <var: #desiredHeapSize type: #usqInt> <var: #headerStart type: #squeakFileOffsetType> <var: #imageOffset type: #squeakFileOffsetType> metaclassNumSlots := 6. "guess Metaclass instSize" classNameIndex := 6. "guess (Class instVarIndexFor: 'name' ifAbsent: []) - 1" swapBytes := self checkImageVersionFrom: f startingAt: imageOffset. headerStart := (self sqImageFilePosition: f) - BytesPerWord. "record header start position" headerSize := self getLongFromFile: f swap: swapBytes. dataSize := self getLongFromFile: f swap: swapBytes. oldBaseAddr := self getLongFromFile: f swap: swapBytes. objectMemory specialObjectsOop: (self getLongFromFile: f swap: swapBytes). objectMemory lastHash: (self getLongFromFile: f swap: swapBytes). "N.B. not used." savedWindowSize := self getLongFromFile: f swap: swapBytes. headerFlags := self getLongFromFile: f swap: swapBytes. self setImageHeaderFlagsFrom: headerFlags. extraVMMemory := self getLongFromFile: f swap: swapBytes. "N.B. not used." hdrNumStackPages := self getShortFromFile: f swap: swapBytes. "4 stack pages is small. Should be able to run with as few as three. 4 should be comfortable but slow. 8 is a reasonable default. Can be changed via vmParameterAt: 43 put: n. Can be set as a preference (Info.plist, VM.ini, command line etc). If desiredNumStackPages is already non-zero then it has been set as a preference. Ignore (but preserve) the header's default." numStackPages := desiredNumStackPages ~= 0 ifTrue: [desiredNumStackPages] ifFalse: [hdrNumStackPages = 0 ifTrue: [self defaultNumStackPages] ifFalse: [hdrNumStackPages]]. desiredNumStackPages := hdrNumStackPages. "This slot holds the size of the native method zone in 1k units. (pad to word boundary)." hdrCogCodeSize := (self getShortFromFile: f swap: swapBytes) * 1024. cogCodeSize := desiredCogCodeSize ~= 0 ifTrue: [desiredCogCodeSize] ifFalse: [hdrCogCodeSize = 0 ifTrue: [self defaultCogCodeSize] ifFalse: [hdrCogCodeSize]]. hdrEdenBytes := self getLongFromFile: f swap: swapBytes. objectMemory edenBytes: (desiredEdenBytes ~= 0 ifTrue: [desiredEdenBytes] ifFalse: [hdrEdenBytes = 0 ifTrue: [objectMemory defaultEdenBytes] ifFalse: [hdrEdenBytes]]). desiredEdenBytes := hdrEdenBytes. hdrMaxExtSemTabSize := self getShortFromFile: f swap: swapBytes. hdrMaxExtSemTabSize ~= 0 ifTrue: [self setMaxExtSemSizeTo: hdrMaxExtSemTabSize]. "pad to word boundary. This slot can be used for anything else that will fit in 16 bits. Preserve it to be polite to other VMs." the2ndUnknownShort := self getShortFromFile: f swap: swapBytes. firstSegSize := self getLongFromFile: f swap: swapBytes. objectMemory firstSegmentSize: firstSegSize. "compare memory requirements with availability" minimumMemory := cogCodeSize "no need to include the stackZone; this is alloca'ed" + dataSize + objectMemory newSpaceBytes + self interpreterAllocationReserveBytes. heapSize := cogCodeSize "no need to include the stackZone; this is alloca'ed" + desiredHeapSize "+ edenBytes" "don't include edenBytes; this is part of the heap and so part of desiredHeapSize" + self interpreterAllocationReserveBytes. heapSize < minimumMemory ifTrue: [self insufficientMemorySpecifiedError]. "allocate a contiguous block of memory for the Squeak heap and ancilliary data structures" objectMemory memory: (self allocateMemory: heapSize minimum: minimumMemory imageFile: f headerSize: headerSize) asUnsignedInteger. objectMemory memory ifNil: [self insufficientMemoryAvailableError]. heapBase := objectMemory + setHeapBase: objectMemory memory + cogCodeSize - setHeapBase: objectMemory memory memoryLimit: objectMemory memory + heapSize endOfMemory: objectMemory memory + dataSize. "position file after the header" self sqImageFile: f Seek: headerStart + headerSize. "read in the image in bulk, then swap the bytes if necessary" bytesRead := objectMemory readHeapFromImageFile: f dataBytes: dataSize. bytesRead ~= dataSize ifTrue: [self unableToReadImageError]. self ensureImageFormatIsUpToDate: swapBytes. "compute difference between old and new memory base addresses" bytesToShift := objectMemory memoryBaseForImageRead - oldBaseAddr. self initializeInterpreter: bytesToShift. "adjusts all oops to new location" self initializeCodeGenerator. ^dataSize! Item was removed: - ----- Method: Spur32BitCoMemoryManager>>setHeapBase:memoryLimit:endOfMemory: (in category 'snapshot') ----- - setHeapBase: baseOfHeap memoryLimit: memLimit endOfMemory: memEnd - "Set the dimensions of the heap, answering the start of oldSpace. - Override to position the cog code zone beneath the heap." - ^super setHeapBase: coInterpreter cogCodeSize memoryLimit: memLimit endOfMemory: memEnd! Item was removed: - ----- Method: Spur32BitMMLECoSimulator>>setHeapBase:memoryLimit:endOfMemory: (in category 'initialization') ----- - setHeapBase: baseOfHeap memoryLimit: memLimit endOfMemory: memEnd - "Set the dimensions of the heap, answering the start of oldSpace. - Override to add a guard page beneath the code zone. We can't use - super; we need to skip over the super implementation." - ^self - perform: #setHeapBase:memoryLimit:endOfMemory: - withArguments: { baseOfHeap. - memLimit. - memEnd } - inSuperclass: Spur32BitMemoryManager! Item was changed: ----- Method: SpurMemoryManager>>initializeOldSpaceFirstFree: (in category 'free space') ----- initializeOldSpaceFirstFree: startOfFreeOldSpace <var: 'startOfFreeOldSpace' type: #usqLong> | limit freeOldStart freeChunk | <var: 'limit' type: #usqLong> <var: 'freeOldStart' type: #usqLong> limit := endOfMemory - self bridgeSize. limit > startOfFreeOldSpace ifTrue: [totalFreeOldSpace := totalFreeOldSpace + (limit - startOfFreeOldSpace). freeOldStart := startOfFreeOldSpace. + self wordSize > 4 ifTrue: + [[limit - freeOldStart >= (1 << 32)] whileTrue: + [freeChunk := self freeChunkWithBytes: (1 << 32) at: freeOldStart. + freeOldStart := freeOldStart + (1 << 32). + self assert: freeOldStart = (self addressAfter: freeChunk)]]. - [limit - freeOldStart >= (2 raisedTo: 32)] whileTrue: - [freeChunk := self freeChunkWithBytes: (2 raisedTo: 32) at: freeOldStart. - freeOldStart := freeOldStart + (2 raisedTo: 32). - self assert: freeOldStart = (self addressAfter: freeChunk)]. freeOldStart < limit ifTrue: [freeChunk := self freeChunkWithBytes: limit - freeOldStart at: freeOldStart. self assert: (self addressAfter: freeChunk) = limit]]. freeOldSpaceStart := endOfMemory. self checkFreeSpace! Item was changed: ----- Method: StackInterpreter>>followForwardingPointersInStackZone: (in category 'object memory support') ----- followForwardingPointersInStackZone: theBecomeEffectsFlags "Spur's become: is lazy, turning the becommed object into a forwarding object to the other. + The read-barrier is minimised by arranging that forwarding pointers will fail a method cache + probe, since notionally objects' internals are accessed only via sending messages to them, + the exception is primitives that access the internals of the non-receiver argument(s). + To avoid a read barrier on bytecode, literal and inst var fetch we scan the receivers and + methods in the stack zone and follow any forwarded ones. This is of course way cheaper + than scanning all of memory as in the old become." - The read-barrier is minimised by arranging that forwarding pointers will fail a method cache probe, - since notionally objects' internals are accessed only via sending messages to them (the exception - is primitives that access the internals of the non-receiver argument(s). - To avoid a read barrier on bytecode, literal and inst var fetch we scan the receivers and methods - in the stack zone and follow any forwarded ones. This is of course way cheaper than scanning all - of memory as in the old become." | theIPPtr | <inline: false> <var: #thePage type: #'StackPage *'> <var: #theSP type: #'char *'> <var: #theFP type: #'char *'> <var: #callerFP type: #'char *'> <var: #theIPPtr type: #usqInt> (theBecomeEffectsFlags anyMask: BecameCompiledMethodFlag) ifTrue: [(objectMemory isForwarded: method) ifTrue: [theIPPtr := instructionPointer - method. method := objectMemory followForwarded: method. instructionPointer := method + theIPPtr]. (objectMemory isForwarded: newMethod) ifTrue: [newMethod := objectMemory followForwarded: newMethod]]. self assert: stackPage ~= 0. 0 to: numStackPages - 1 do: [:i| | thePage theSP theFP callerFP theIP oop | thePage := stackPages stackPageAt: i. thePage isFree ifFalse: [theSP := thePage headSP. theFP := thePage headFP. "Skip the instruction pointer on top of stack of inactive pages." thePage = stackPage ifTrue: [theIPPtr := 0] ifFalse: [theIPPtr := theSP asUnsignedInteger. theSP := theSP + BytesPerWord]. [self assert: (thePage addressIsInPage: theFP). self assert: (theIPPtr = 0 or: [thePage addressIsInPage: theIPPtr asVoidPointer]). oop := stackPages longAt: theFP + FoxReceiver. ((objectMemory isNonImmediate: oop) and: [(objectMemory isForwarded: oop)]) ifTrue: [stackPages longAt: theFP + FoxReceiver put: (objectMemory followForwarded: oop)]. theIP := (theFP + (self frameStackedReceiverOffset: theFP)) asUnsignedInteger. "reuse theIP; its just an offset here" oop := stackPages longAt: theIP. ((objectMemory isNonImmediate: oop) and: [(objectMemory isForwarded: oop)]) ifTrue: [stackPages longAt: theIP put: (objectMemory followForwarded: oop)]. ((self frameHasContext: theFP) and: [(objectMemory isForwarded: (self frameContext: theFP))]) ifTrue: [stackPages longAt: theFP + FoxThisContext put: (objectMemory followForwarded: (self frameContext: theFP))]. oop := self frameMethod: theFP. (objectMemory isForwarded: oop) ifTrue: [| delta | theIPPtr ~= 0 ifTrue: [self assert: (stackPages longAt: theIPPtr) > (self frameMethod: theFP). delta := (objectMemory followForwarded: oop) - oop. stackPages longAt: theIPPtr put: (stackPages longAt: theIPPtr) + delta]. stackPages longAt: theFP + FoxMethod put: (objectMemory followForwarded: oop)]. self followNecessaryForwardingInMethod: (self frameMethod: theFP). (callerFP := self frameCallerFP: theFP) ~= 0] whileTrue: [theIPPtr := (theFP + FoxCallerSavedIP) asUnsignedInteger. theFP := callerFP]]]!

1 0

VM Maker: VMMaker.oscog-eem.520.mcz
by commits＠source.squeak.org 25 Nov '13

25 Nov '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.520.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.520 Author: eem Time: 25 November 2013, 2:50:47.877 pm UUID: 15712719-732a-4659-bf8a-6272bc059cc5 Ancestors: VMMaker.oscog-eem.519 Undo the mistake of attempting to place the code zone between newSpace and oldSpace. Avoid scavenging Cog methods, which a simple bounds check would judge as being young, by having Spur32BitCoMemoryManager>>isReallyYoungObject: filter-out Cog methods and copyAndForward: using isReallyYoungObject:. Fix linking for new classes in Spur by having Cogit>>canLinkToYoungClasses dispatch to the objectRepresentation. Hence include the methodZone in the objectRepresentation's inst vars. =============== Diff against VMMaker.oscog-eem.519 =============== Item was changed: ----- Method: CoInterpreter>>ceSend:super:to:numArgs: (in category 'trampolines') ----- ceSend: selector super: superNormalBar to: rcvr numArgs: numArgs "Entry-point for an unlinked send in a CogMethod. Smalltalk stack looks like receiver args head sp -> sender return pc If an MNU then defer to handleMNUInMachineCodeTo:... which will dispatch the MNU and may choose to allocate a closed PIC with a fast MNU dispatch for this send. Otherwise attempt to link the send site as efficiently as possible. All link attempts may fail; e.g. because we're out of code memory. Continue execution via either executeMethod or interpretMethodFromMachineCode: depending on whether the target method is cogged or not." <api> | classTag canLinkCacheTag errSelIdx cogMethod | <inline: false> <var: #cogMethod type: #'CogMethod *'> <var: #newCogMethod type: #'CogMethod *'> "self printExternalHeadFrame" "self printStringOf: selector" cogit assertCStackWellAligned. self assert: (objectMemory addressCouldBeOop: rcvr). self sendBreakpoint: selector receiver: rcvr. superNormalBar = 0 ifTrue: [classTag := objectMemory fetchClassTagOf: rcvr] ifFalse: [classTag := objectMemory classTagForClass: (self superclassOf: (self methodClassOf: (self frameMethodObject: framePointer)))]. + canLinkCacheTag := cogit canLinkToYoungClasses or: [(objectMemory isYoungObject: classTag) not]. - canLinkCacheTag := objectMemory hasSpurMemoryManagerAPI - or: [(objectMemory isYoungObject: classTag) not or: [cogit canLinkToYoungClasses]]. argumentCount := numArgs. (self lookupInMethodCacheSel: selector classTag: classTag) ifTrue:"check for coggability because method is in the cache" [self ifAppropriateCompileToNativeCode: newMethod selector: selector] ifFalse: [messageSelector := selector. (errSelIdx := self lookupMethodNoMNUEtcInClass: (objectMemory classForClassTag: classTag)) ~= 0 ifTrue: [(canLinkCacheTag and: [errSelIdx = SelectorDoesNotUnderstand and: [(cogMethod := cogit cogMNUPICSelector: messageSelector methodOperand: (self mnuMethodOrNilFor: rcvr) numArgs: argumentCount) asUnsignedInteger > cogit minCogMethodAddress]]) ifTrue: [cogit linkSendAt: (stackPages longAt: stackPointer) in: (self mframeHomeMethod: framePointer) to: cogMethod offset: (superNormalBar = 0 ifTrue: [cogit entryOffset] ifFalse: [cogit noCheckEntryOffset]) receiver: rcvr]. self handleMNU: errSelIdx InMachineCodeTo: rcvr classForMessage: (objectMemory classForClassTag: classTag). self assert: false "NOTREACHED"]]. "Method found and has a cog method. Attempt to link to it. The receiver's class may be young. If the Cogit can't store young classes in inline caches we can link to an open PIC instead." (self maybeMethodHasCogMethod: newMethod) ifTrue: [cogMethod := self cogMethodOf: newMethod. cogMethod selector = objectMemory nilObject ifTrue: [cogit setSelectorOf: cogMethod to: selector] ifFalse: ["Deal with anonymous accessors, e.g. in Newspeak. The cogMethod may not have the correct selector. If not, try and compile a new method with the correct selector." cogMethod selector ~= selector ifTrue: [(cogit cog: newMethod selector: selector) ifNotNil: [:newCogMethod| cogMethod := newCogMethod]]]. (cogMethod selector = selector and: [canLinkCacheTag]) ifTrue: [cogit linkSendAt: (stackPages longAt: stackPointer) in: (self mframeHomeMethod: framePointer) to: cogMethod offset: (superNormalBar = 0 ifTrue: [cogit entryOffset] ifFalse: [cogit noCheckEntryOffset]) receiver: rcvr] ifFalse: "If patchToOpenPICFor:.. returns we're out of code memory" [cogit patchToOpenPICFor: selector numArgs: numArgs receiver: rcvr]. instructionPointer := self popStack. self executeNewMethod. self assert: false "NOTREACHED"]. instructionPointer := self popStack. ^self interpretMethodFromMachineCode "NOTREACHED"! Item was changed: ----- Method: CoInterpreter>>initializeCodeGenerator (in category 'initialization') ----- initializeCodeGenerator + cogit + initializeCodeZoneFrom: (self cCode: [objectMemory memory] inSmalltalk: [Cogit guardPageSize]) + upTo: (self cCode: [objectMemory memory] inSmalltalk: [Cogit guardPageSize]) + cogCodeSize! - objectMemory hasSpurMemoryManagerAPI - ifTrue: - [cogit - initializeCodeZoneFrom: objectMemory newSpaceLimit - upTo: objectMemory newSpaceLimit + cogCodeSize] - ifFalse: - [cogit - initializeCodeZoneFrom: (self cCode: [objectMemory memory] inSmalltalk: [Cogit guardPageSize]) - upTo: (self cCode: [objectMemory memory] inSmalltalk: [Cogit guardPageSize]) + cogCodeSize]! Item was changed: ----- Method: CoInterpreter>>isCogMethodReference: (in category 'compiled methods') ----- isCogMethodReference: methodHeader <api> self assert: ((objectMemory isIntegerObject: methodHeader) + or: [methodHeader asUnsignedInteger < objectMemory startOfMemory - or: [methodHeader asUnsignedInteger < cogit maxCogMethodAddress and: [methodHeader asUnsignedInteger >= cogit minCogMethodAddress]]). ^objectMemory isNonIntegerObject: methodHeader! Item was changed: ----- Method: CoInterpreterStackPages>>initializeStack:numSlots:pageSize: (in category 'initialization') ----- initializeStack: theStackPages numSlots: stackSlots pageSize: slotsPerPage "Initialize the stack pages. In the C VM theStackPages will be alloca'ed memory to hold the stack pages on the C stack. In the simulator they are housed in the memory between the cogMethodZone and the heap." <var: #theStackPages type: #'char *'> <returnTypeC: #void> | numPages page structStackPageSize pageStructBase count | <var: #page type: #'StackPage *'> <var: #pageStructBase type: #'char *'> self cCode: [] inSmalltalk: + [self assert: objectMemory startOfMemory - coInterpreter cogCodeSize - Cogit guardPageSize - coInterpreter methodCacheSize - coInterpreter primTraceLogSize - coInterpreter rumpCStackSize + = (stackSlots * BytesPerWord roundUpTo: objectMemory allocationUnit)]. - [objectMemory hasSpurMemoryManagerAPI - ifTrue: - [self assert: objectMemory oldSpaceStart - objectMemory newSpaceLimit - coInterpreter cogCodeSize - coInterpreter methodCacheSize - coInterpreter primTraceLogSize - coInterpreter rumpCStackSize - Cogit guardPageSize - = (stackSlots * BytesPerWord roundUpTo: objectMemory allocationUnit)] - ifFalse: - [self assert: objectMemory startOfMemory - coInterpreter cogCodeSize - coInterpreter methodCacheSize - coInterpreter primTraceLogSize - coInterpreter rumpCStackSize - Cogit guardPageSize - = (stackSlots * BytesPerWord roundUpTo: objectMemory allocationUnit)]]. structStackPageSize := coInterpreter sizeof: InterpreterStackPage. bytesPerPage := slotsPerPage * BytesPerWord. numPages := coInterpreter numStkPages. "Because stack pages grow down baseAddress is at the top of a stack page and so to avoid subtracting BytesPerWord from baseAddress and lastAddress in the init loop below we simply push the stackPage array up one word to avoid the overlap. This word is extraStackBytes." pageStructBase := theStackPages + (numPages * bytesPerPage) + BytesPerWord. pages := self cCode: [self cCoerceSimple: pageStructBase to: #'StackPage *'] inSmalltalk: [pageMap := Dictionary new. ((0 to: numPages - 1) collect: [:i| InterpreterStackPage surrogateClass new address: pageStructBase + (i * structStackPageSize) simulator: coInterpreter zoneBase: coInterpreter stackZoneBase zoneLimit: objectMemory startOfMemory]) do: [:pageSurrogate| pageMap at: pageSurrogate address put: pageSurrogate]; yourself]. "make sure there's enough headroom" self assert: coInterpreter stackPageByteSize - coInterpreter stackLimitBytes - coInterpreter stackLimitOffset >= coInterpreter stackPageHeadroom. 0 to: numPages - 1 do: [:index| page := self stackPageAt: index. page lastAddress: theStackPages + (index * bytesPerPage); baseAddress: page lastAddress + bytesPerPage; stackLimit: page baseAddress - coInterpreter stackLimitBytes; realStackLimit: page stackLimit; baseFP: 0; nextPage: (self stackPageAt: (index = (numPages - 1) ifTrue: [0] ifFalse: [index + 1])); prevPage: (self stackPageAt: (index = 0 ifTrue: [numPages - 1] ifFalse: [index - 1]))]. "Now compute stackBasePlus1 so that the pageIndexFor: call maps all addresses from aPage baseAddress to aBase limitAddress + 1 to the same index (stacks grow down)" stackBasePlus1 := (self cCoerceSimple: theStackPages to: #'char *') + 1. self cCode: [] inSmalltalk: [minStackAddress := theStackPages. maxStackAddress := theStackPages + (numPages * bytesPerPage) + BytesPerWord - 1]. "The overflow limit is the amount of stack to retain when moving frames from an overflowing stack to reduce thrashing. See stackOverflowOrEvent:mayContextSwitch:" page := self stackPageAt: 0. overflowLimit := page baseAddress - page realStackLimit * 3 // 5. 0 to: numPages - 1 do: [:index| page := self stackPageAt: index. self assert: (self pageIndexFor: page baseAddress) == index. self assert: (self pageIndexFor: page baseAddress - (slotsPerPage - 1 * BytesPerWord)) == index. self assert: (self stackPageFor: page baseAddress) == page. self assert: (self stackPageFor: page stackLimit) == page. self cCode: [] inSmalltalk: [| memIndex | memIndex := index * slotsPerPage + 1. "this is memIndex in the block above" self assert: (self memIndexFor: (self oopForPointer: page baseAddress)) == (memIndex + slotsPerPage - 1). index < (numPages - 1) ifTrue: [self assert: (self stackPageFor: page baseAddress + BytesPerWord) == (self stackPageAt: index + 1)]]. coInterpreter initializePageTraceToInvalid: page]. mostRecentlyUsedPage := self stackPageAt: 0. page := mostRecentlyUsedPage. count := 0. [| theIndex | count := count + 1. theIndex := self pageIndexFor: page baseAddress. self assert: (self stackPageAt: theIndex) == page. self assert: (self pageIndexFor: page baseAddress) == theIndex. self assert: (self pageIndexFor: page stackLimit) == theIndex. self assert: (self pageIndexFor: page lastAddress + 1) == theIndex. (page := page nextPage) ~= mostRecentlyUsedPage] whileTrue. self assert: count == numPages. self assert: self pageListIsWellFormed! Item was changed: CogClass subclass: #CogObjectRepresentation + instanceVariableNames: 'cogit methodZone objectMemory ceStoreCheckTrampoline' - instanceVariableNames: 'cogit objectMemory ceStoreCheckTrampoline' classVariableNames: '' poolDictionaries: 'CogMethodConstants CogRTLOpcodes VMBasicConstants VMObjectIndices' category: 'VMMaker-JIT'! !CogObjectRepresentation commentStamp: '<historical>' prior: 0! I am an abstract superclass for object representations whose job it is to generate abstract instructions for accessing objects. It is hoped that this level of indirection between the Cogit code generator and object access makes it easier to adapt the code generator to different garbage collectors, object representations and languages.! Item was removed: - ----- Method: CogObjectRepresentation class>>for: (in category 'instance creation') ----- - for: aCogit - ^self new setCogit: aCogit! Item was added: + ----- Method: CogObjectRepresentation class>>forCogit:methodZone: (in category 'instance creation') ----- + forCogit: aCogit methodZone: methodZone + ^self new setCogit: aCogit methodZone: methodZone! Item was removed: - ----- Method: CogObjectRepresentation>>setCogit: (in category 'initialization') ----- - setCogit: aCogit - <doNotGenerate> - cogit := aCogit. - objectMemory := (aCogit coInterpreter isKindOf: ObjectMemory) - ifTrue: [aCogit coInterpreter] - ifFalse: [aCogit coInterpreter objectMemory]! Item was added: + ----- Method: CogObjectRepresentation>>setCogit:methodZone: (in category 'initialization') ----- + setCogit: aCogit methodZone: aMethodZone + <doNotGenerate> + cogit := aCogit. + methodZone := aMethodZone. + objectMemory := (aCogit coInterpreter isKindOf: StackInterpreter) + ifTrue: [aCogit coInterpreter objectMemory] + ifFalse: [aCogit coInterpreter]! Item was added: + ----- Method: CogObjectRepresentationForSpur>>canLinkToYoungClasses (in category 'in-line cacheing') ----- + canLinkToYoungClasses + <api> + <cmacro: '() true'> + ^true! Item was added: + ----- Method: CogObjectRepresentationForSqueakV3>>canLinkToYoungClasses (in category 'in-line cacheing') ----- + canLinkToYoungClasses + <api> + ^methodZone roomOnYoungReferrersList! Item was changed: ----- Method: CogVMSimulator>>stackZoneBase (in category 'stack pages') ----- stackZoneBase "In the simulator the stack zone starts immediately after the code zone." + ^cogit cogCodeBase + cogCodeSize! - ^objectMemory cogCodeBase + cogCodeSize! Item was changed: ----- Method: Cogit>>canLinkToYoungClasses (in category 'jit - api') ----- canLinkToYoungClasses + <doNotGenerate> + ^objectRepresentation canLinkToYoungClasses! - <api> - ^methodZone roomOnYoungReferrersList! Item was changed: ----- Method: Cogit>>setInterpreter: (in category 'initialization') ----- setInterpreter: aCoInterpreter "Initialization of the code generator in the simulator. These objects already exist in the generated C VM or are used only in the simulation." <doNotGenerate> coInterpreter := aCoInterpreter. objectMemory := aCoInterpreter objectMemory. threadManager := aCoInterpreter threadManager. "N.B. may be nil" - objectRepresentation := objectMemory objectRepresentationClass for: self. methodZone := CogMethodZone new. + objectRepresentation := objectMemory objectRepresentationClass + forCogit: self methodZone: methodZone. methodZone setInterpreter: aCoInterpreter objectRepresentation: objectRepresentation cogit: self. generatorTable := self class generatorTable. primitiveGeneratorTable := self class primitiveTable. processor := ProcessorClass new. simulatedAddresses := Dictionary new. simulatedTrampolines := Dictionary new. simulatedVariableGetters := Dictionary new. simulatedVariableSetters := Dictionary new. traceStores := 0. traceFlags := 8. "record prim trace on by default (see Cogit class>>decareCVarsIn:)" debugPrimCallStackOffset := 0. singleStep := printRegisters := printInstructions := clickConfirm := false. breakBlock ifNil: [self breakPC: breakPC]. (backEnd := processor abstractInstructionCompilerClass new) cogit: self. (methodLabel := processor abstractInstructionCompilerClass new) cogit: self. sendTrampolines := CArrayAccessor on: (Array new: NumSendTrampolines). superSendTrampolines := CArrayAccessor on: (Array new: NumSendTrampolines). NewspeakVM ifTrue: [dynamicSuperSendTrampolines := CArrayAccessor on: (Array new: NumSendTrampolines)]. "debug metadata" objectReferencesInRuntime := CArrayAccessor on: (Array new: NumObjRefsInRuntime). runtimeObjectRefIndex := 0. "debug metadata" trampolineAddresses := CArrayAccessor on: (Array new: NumTrampolines * 2). trampolineTableIndex := 0. compilationTrace ifNil: [compilationTrace := 0]. extA := extB := 0! Item was changed: ----- Method: Cogit>>simulateCogCodeAt: (in category 'simulation only') ----- simulateCogCodeAt: address "<Integer>" <doNotGenerate> | stackZoneBase | stackZoneBase := coInterpreter stackZoneBase. processor pc: address. [[[singleStep ifTrue: [[processor sp < stackZoneBase ifTrue: [self halt]. self recordProcessing. (breakPC isInteger ifTrue: [processor pc = breakPC and: [breakBlock value: self]] ifFalse: [breakBlock value: self]) ifTrue: ["printRegisters := printInstructions := true" "self reportLastNInstructions" "coInterpreter printExternalHeadFrame" "coInterpreter printFrameAndCallers: coInterpreter framePointer SP: coInterpreter stackPointer" "coInterpreter shortPrintFrameAndCallers: coInterpreter framePointer" "coInterpreter printFrame: processor fp WithSP: processor sp" "coInterpreter printFrameAndCallers: processor fp SP: processor sp" "coInterpreter shortPrintFrameAndCallers: processor fp" "self disassembleMethodFor: processor pc" coInterpreter changed: #byteCountText. self halt: 'machine code breakpoint at ', (breakPC isInteger ifTrue: [breakPC hex] ifFalse: [String streamContents: [:s| breakBlock decompile printOn: s indent: 0]])]] value]. "So that the Debugger's Over steps over all this" singleStep ifTrue: [processor singleStepIn: coInterpreter memory minimumAddress: guardPageSize + readOnlyBelow: methodZone zoneEnd] - executableAndReadOnlyFrom: codeBase - to: methodZone zoneEnd] ifFalse: [processor runInMemory: coInterpreter memory minimumAddress: guardPageSize + readOnlyBelow: methodZone zoneEnd]. - executableAndReadOnlyFrom: codeBase - to: methodZone zoneEnd]. ((printRegisters or: [printInstructions]) and: [clickConfirm]) ifTrue: [(self confirm: 'continue?') ifFalse: [self halt]]. true] whileTrue] on: ProcessorSimulationTrap do: [:ex| self handleSimulationTrap: ex]. true] whileTrue! Item was changed: ----- Method: Cogit>>simulateLeafCallOf: (in category 'simulation only') ----- simulateLeafCallOf: someFunction "Simulate execution of machine code that leaf-calls someFunction, answering the result returned by someFunction." <doNotGenerate> | spOnEntry | self recordRegisters. processor simulateLeafCallOf: someFunction nextpc: 16rBADF00D5 memory: coInterpreter memory. spOnEntry := processor sp. self recordInstruction: {'(simulated call of '. someFunction. ')'}. + [[processor pc between: 0 and: methodZone zoneEnd] whileTrue: - [[processor pc between: codeBase and: methodZone zoneEnd] whileTrue: [singleStep ifTrue: [self recordProcessing. processor singleStepIn: coInterpreter memory minimumAddress: guardPageSize + readOnlyBelow: methodZone zoneEnd] - executableAndReadOnlyFrom: codeBase - to: methodZone zoneEnd] ifFalse: [processor runInMemory: coInterpreter memory minimumAddress: guardPageSize + readOnlyBelow: methodZone zoneEnd]]] - executableAndReadOnlyFrom: codeBase - to: methodZone zoneEnd]]] on: ProcessorSimulationTrap do: [:ex| | retpc | "If the ip is out of bounds the return has already occurred." + ((processor pc between: 0 and: methodZone zoneEnd) - ((processor pc between: codeBase and: methodZone zoneEnd) and: [processor sp <= spOnEntry]) ifTrue: [retpc := processor leafRetpcIn: coInterpreter memory. self assert: retpc = 16rBADF00D5. self recordInstruction: {'(simulated return to '. retpc. ')'. processor simulateLeafReturnIn: coInterpreter memory}. self recordRegisters]]. ^processor cResultRegister! Item was changed: ----- Method: NewCoObjectMemorySimulator>>cogCodeBase (in category 'simulation only') ----- cogCodeBase + ^Cogit guardPageSize! - ^0! Item was changed: ----- Method: ObjectMemory>>setHeapBase:memoryLimit:endOfMemory: (in category 'initialization') ----- setHeapBase: heapBase memoryLimit: memLimit endOfMemory: memEnd + "Set the dimensions of the heap, answering the start of oldSpace." - "Set the dimentions of the heap, answering the start of oldSpace." self setMemoryLimit: memLimit. self setEndOfMemory: memEnd. ^heapBase! Item was changed: Spur32BitMemoryManager subclass: #Spur32BitCoMemoryManager instanceVariableNames: 'cogit' classVariableNames: '' poolDictionaries: 'CogMethodConstants' category: 'VMMaker-SpurMemoryManager'! + !Spur32BitCoMemoryManager commentStamp: 'eem 11/25/2013 14:47' prior: 0! + Spur32BitCoMemoryManager is a refinement of Spur32BitMemoryManager that supports the CoInterpreter/Cogit just-in-time compiler. The significant difference from Spur32BitMemoryManager is the memory layout. Spur32BitCoMemoryManager adds the cogCodeZone beneath newSpace: - !Spur32BitCoMemoryManager commentStamp: 'eem 11/20/2013 13:45' prior: 0! - Spur32BitCoMemoryManager is a refinement of Spur32BitMemoryManager that supports the CoInterpreter/Cogit just-in-time compiler. The signifiant difference from Spur32BitMemoryManager is the memory layout. Spur32BitCoMemoryManager adds the cgCodeZone between newSpace and the firts oldSpace segment: low address: - newSpace: - past/future survivor space - future/past survivor space - eden cogCodeZone: generated run-time cog methods free space young referrers + newSpace: + past/future survivor space + future/past survivor space + eden first oldSpace segment ... subsequent oldSpace segment high address: + It would be convenient if the code zone were placed between newSpace and oldSpace; then Cog methods could be onsidered neither old nor young, filtering them out of copyAndForward: and the store check with single bounds checks. But the CoInterpreter already assumes Cog methods are less than all objects (e.g. in its isMachineCodeFrame:). If the dynamic frequency of isMachineCodeFrame: is higher (likely because this is used in e.g. scanning for unwind protects in non-local return) then it should keep the single bounds check. So the coder zone remains beneath newSpace and Spur32BitCoMemoryManager ocerrides isReallyYoungObject: to filter-out Cog methods for copyAndForward:. + Instance Variables cogit: <SimpleStackBasedCogit or subclass> cogit + - the just-in-time compiler! - - the just-in-time compiler - ! Item was changed: ----- Method: Spur32BitCoMemoryManager>>checkMemoryMap (in category 'debug support') ----- checkMemoryMap "Override to check that Cog methods are considered neither young nor old. Being young would cause them to be scavenged. Being old would cause them to be remembered if stored into (but wait, they don't get stored into)." self assert: (self isYoungObject: newSpaceStart). self assert: (self isYoungObject: newSpaceLimit - self wordSize). self assert: (self isOldObject: newSpaceStart) not. self assert: (self isOldObject: newSpaceLimit - self wordSize) not. self assert: (self isYoungObject: newSpaceLimit) not. self assert: (self isYoungObject: oldSpaceStart) not. self assert: (self isYoungObject: endOfMemory) not. self assert: (self isOldObject: oldSpaceStart). self assert: (self isOldObject: endOfMemory). + "we would like the following to be true, but we either choose one boundary check for + cogMethods vs objects (isMachineCodeFrame: et al) or one boundary check for + copyAndForward:. We can't have both, and the former is likely the highest dynamic + frequency." + false ifTrue: + [self assert: (self isYoungObject: cogit minCogMethodAddress) not. + self assert: (self isYoungObject: cogit maxCogMethodAddress) not]. - self assert: (self isYoungObject: cogit minCogMethodAddress) not. - self assert: (self isYoungObject: cogit maxCogMethodAddress) not. self assert: (self isOldObject: cogit minCogMethodAddress) not. self assert: (self isOldObject: cogit maxCogMethodAddress) not! Item was added: + ----- Method: Spur32BitCoMemoryManager>>isReallyYoungObject: (in category 'object testing') ----- + isReallyYoungObject: objOop + <api> + "Answer if obj is young. Require that obj is non-immediate. Override to filter-out Cog methods" + self assert: (self isNonImmediate: objOop). + ^(self oop: objOop isLessThan: newSpaceLimit) + and: [self oop: objOop isGreaterThanOrEqualTo: newSpaceStart]! Item was changed: ----- Method: Spur32BitCoMemoryManager>>setHeapBase:memoryLimit:endOfMemory: (in category 'snapshot') ----- setHeapBase: baseOfHeap memoryLimit: memLimit endOfMemory: memEnd "Set the dimensions of the heap, answering the start of oldSpace. + Override to position the cog code zone beneath the heap." + ^super setHeapBase: coInterpreter cogCodeSize memoryLimit: memLimit endOfMemory: memEnd! - Override to position oldSpace above the cog code zone." - super setHeapBase: baseOfHeap memoryLimit: memLimit endOfMemory: memEnd. - ^oldSpaceStart := newSpaceLimit + coInterpreter cogCodeSize! Item was changed: ----- Method: Spur32BitMMLECoSimulator>>cogCodeBase (in category 'simulation only') ----- cogCodeBase + ^Cogit guardPageSize! - ^newSpaceLimit! Item was changed: ----- Method: Spur32BitMMLECoSimulator>>setHeapBase:memoryLimit:endOfMemory: (in category 'initialization') ----- setHeapBase: baseOfHeap memoryLimit: memLimit endOfMemory: memEnd "Set the dimensions of the heap, answering the start of oldSpace. + Override to add a guard page beneath the code zone. We can't use + super; we need to skip over the super implementation." + ^self + perform: #setHeapBase:memoryLimit:endOfMemory: + withArguments: { baseOfHeap. + memLimit. + memEnd } + inSuperclass: Spur32BitMemoryManager! - Override to add a guard page beneath the heap." - "As invoked by CogVMSimulator>>openOn:extraBytes: baseOfHeap contains the combined - zone sizes for cog methods, stack zone, etc. The memory map in SqueakV3 looks like - 0: cogCode - stackZone - methodCache - primTraceLog - rumpCStack - heapBase: - nilObj etc - But here in Spur we want - 0: guardPage - guardPageSize: - newSpace: - past/future survivor space - past/future survivor space - eden - M: - cogCode - stackZone - methodCache - primTraceLog - rumpCStack - heapBase: - nilObj etc" - super setHeapBase: Cogit guardPageSize memoryLimit: memLimit endOfMemory: memEnd. - ^oldSpaceStart := newSpaceLimit + baseOfHeap! Item was changed: ----- Method: SpurGenerationScavenger>>scavengeReferentsOf: (in category 'scavenger') ----- scavengeReferentsOf: referrer "scavengeReferentsOf: referrer inspects all the pointers in referrer. If any are new objects, it has them moved to FutureSurvivorSpace, and answers truth. If there are no new referents, it answers falsity. To handle weak arrays, if the referrer is weak only scavenge strong slots and answer true so that it won't be removed from the remembered set until later." | foundNewReferent | "forwarding objects should be followed by callers, unless the forwarder is a root in the remembered table." self assert: ((manager isForwarded: referrer) not or: [manager isRemembered: referrer]). "unscanned ephemerons should be scanned later." self assert: ((manager isEphemeron: referrer) not or: [(self isScavengeSurvivor: (manager keyOfEphemeron: referrer)) or: [self is: referrer onWeaklingList: ephemeronList]]). foundNewReferent := false. 0 to: (manager numStrongSlotsOf: referrer ephemeronInactiveIf: #isScavengeSurvivor:) - 1 do: [:i| | referent newLocation | referent := manager fetchPointer: i ofMaybeForwardedObject: referrer. (manager isNonImmediate: referent) ifTrue: ["a forwarding pointer could be because of become: or scavenging." (manager isForwarded: referent) ifTrue: [referent := manager followForwarded: referent]. + (manager isReallyYoungObject: referent) - (manager isYoung: referent) ifTrue: "if target is already in future space forwarding pointer was due to a become:." [(manager isInFutureSpace: referent) ifTrue: [newLocation := referent. foundNewReferent := true] ifFalse: [newLocation := self copyAndForward: referent. (manager isYoung: newLocation) ifTrue: [foundNewReferent := true]]. manager storePointerUnchecked: i ofMaybeForwardedObject: referrer withValue: newLocation] ifFalse: [manager storePointerUnchecked: i ofMaybeForwardedObject: referrer withValue: referent]]]. ^foundNewReferent or: [manager isWeakNonImm: referrer]! Item was changed: ----- Method: SpurMemoryManager>>allocateMemoryOfSize:newSpaceSize:stackSize:codeSize: (in category 'spur bootstrap') ----- allocateMemoryOfSize: memoryBytes newSpaceSize: newSpaceBytes stackSize: stackBytes codeSize: codeBytes "Intialize the receiver for bootsraping an image. Set up a large oldSpace and an empty newSpace and set-up freeStart and scavengeThreshold to allocate in oldSpace. Later on (in initializePostBootstrap) freeStart and scavengeThreshold will be set to sane values." <doNotGenerate> self assert: (memoryBytes \\ self allocationUnit = 0 and: [newSpaceBytes \\ self allocationUnit = 0 and: [codeBytes \\ self allocationUnit = 0]]). memory := (self endianness == #little ifTrue: [LittleEndianBitmap] ifFalse: [Bitmap]) new: (memoryBytes + newSpaceBytes + codeBytes + stackBytes) // 4. - "N.B. This layout does NOT reflect the layout of SpurCoMemoryManager" newSpaceStart := codeBytes + stackBytes. endOfMemory := freeOldSpaceStart := memoryBytes + newSpaceBytes + codeBytes + stackBytes. "leave newSpace empty for the bootstrap" freeStart := newSpaceBytes + newSpaceStart. oldSpaceStart := newSpaceLimit := newSpaceBytes + newSpaceStart. scavengeThreshold := memory size * 4. "Bitmap is a 4-byte per word array" scavenger := SpurGenerationScavengerSimulator new. scavenger manager: self. scavenger newSpaceStart: newSpaceStart newSpaceBytes: newSpaceBytes edenBytes: newSpaceBytes * self scavengerDenominator - self numSurvivorSpaces // self scavengerDenominator! Item was changed: ----- Method: SpurMemoryManager>>cheapIsInMemory: (in category 'plugin support') ----- cheapIsInMemory: address "Answer if the given address is in ST object memory. For simulation only." <doNotGenerate> + ^address >= newSpaceStart and: [address < endOfMemory]! - ^(address < newSpaceLimit and: [address >= newSpaceStart]) - or: [address >= oldSpaceStart and: [address < endOfMemory]]! Item was changed: ----- Method: SpurMemoryManager>>checkHeapIntegrity: (in category 'debug support') ----- checkHeapIntegrity: excludeUnmarkedNewSpaceObjs "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." | ok numRememberedRootsInHeap | <inline: false> ok := true. numRememberedRootsInHeap := 0. self allHeapEntitiesDo: [:obj| | containsYoung fieldOop classIndex classOop | ((self isFreeObject: obj) or: [(self isYoungObject: obj) and: [(self isMarked: obj) not and: [excludeUnmarkedNewSpaceObjs]]]) ifFalse: [containsYoung := false. (self isRemembered: obj) ifTrue: [numRememberedRootsInHeap := numRememberedRootsInHeap + 1. (scavenger isInRememberedSet: 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]) and: [(self isHiddenObj: obj) not]) ifTrue: [coInterpreter print: 'object leak in '; printHex: obj; print: ' invalid class index '; printHex: classIndex; print: ' -> '; print: (classOop ifNil: ['nil'] ifNotNil: ['nilObj']); 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]. + "don't be misled by CogMethods; they appear to be young, but they're not" + ((self isYoung: fieldOop) + and: [self oop: fieldOop isGreaterThanOrEqualTo: newSpaceStart]) ifTrue: - (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]]]]. numRememberedRootsInHeap ~= scavenger rememberedSetSize ifTrue: [coInterpreter print: 'root count mismatch. #heap roots '; printNum: numRememberedRootsInHeap; print: '; #roots '; printNum: scavenger rememberedSetSize; cr. self eek. "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 remembered set @ '; printNum: i; print: ' = '; printHex: obj; cr. self eek. ok := false] ifFalse: [(heapMap heapMapAtWord: (self pointerForOop: obj)) = 0 ifTrue: [coInterpreter print: 'object leak in remembered set @ '; printNum: i; print: ' = '; printHex: obj; cr. self eek. ok := false] ifFalse: [(self isYoung: obj) ifTrue: [coInterpreter print: 'non-root in remembered set @ '; printNum: i; print: ' = '; printHex: obj; cr. self eek. ok := false]]]]. 1 to: remapBufferCount do: [:ri| | obj | 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]]]. 1 to: extraRootCount do: [:ri| | obj | 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: SpurMemoryManager>>setHeapBase:memoryLimit:endOfMemory: (in category 'snapshot') ----- setHeapBase: baseOfHeap memoryLimit: memLimit endOfMemory: memEnd "Set the dimensions of the heap, answering the start of oldSpace." "Transcript cr; nextPutAll: 'heapBase: '; print: baseOfHeap; nextPut: $/; nextPutAll: baseOfHeap hex; nextPutAll: ' memLimit '; print: memLimit; nextPut: $/; nextPutAll: memLimit hex; nextPutAll: ' memEnd '; print: memEnd; nextPut: $/; nextPutAll: memEnd hex; cr; flush." "This is a little counter-intuitive. Eden must include interpreterAllocationReserveBytes." newSpaceStart := baseOfHeap. newSpaceLimit := baseOfHeap + self newSpaceBytes + coInterpreter interpreterAllocationReserveBytes. scavenger newSpaceStart: newSpaceStart newSpaceBytes: newSpaceLimit - newSpaceStart edenBytes: newSpaceLimit - newSpaceStart * (self scavengerDenominator - self numSurvivorSpaces) // self scavengerDenominator. freeStart := scavenger eden start. pastSpaceStart := scavenger pastSpace start. + oldSpaceStart := newSpaceLimit. freeOldSpaceStart := memEnd. endOfMemory := memLimit. + ^baseOfHeap! - oldSpaceStart := newSpaceLimit. - ^oldSpaceStart!

1 0

VM Maker: VMMaker.oscog-eem.519.mcz
by commits＠source.squeak.org 25 Nov '13

25 Nov '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.519.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.519 Author: eem Time: 25 November 2013, 1:05:43.721 pm UUID: ac72e5fd-c896-42c5-acee-19a8df8047d0 Ancestors: VMMaker.oscog-eem.518 Commit a costly mistake before undoing the damage. If the code zone sits between newSpace and oldSpace then isMachineCodeFrame: et al need two boundary checks, > newSpaceLimit & < oldSpaceStart. If the code zone sits beneath newSpace then copyAndForward: needs two boundary checks, < newSpaceLimit & > newSpaceStart. So IIABDFI implies reverting to the code zone being beneath newSpace, and fixing copyAndForward:. Tube. 3 days. Ouch. Change Spur's primitiveFullGC to answer the byte size of the largest free chunk, which is what is needed to know whether a new segment is needed. Add primitiveSizeInBytes[OfInstance] so the image doesn't have to assume anything about header sizes. Fix checkMaybeObjRefAt: to filter-out the 0's from unused method parameters in closed PICs. Fix a return-type conflict in printOopShortInner:. Slang: Fix Integer << Integer to cast to 64-bits if the shift overflows 32-bits. =============== Diff against VMMaker.oscog-eem.518 =============== Item was changed: ----- Method: CCodeGenerator>>generateShiftLeft:on:indent: (in category 'C translation') ----- generateShiftLeft: msgNode on: aStream indent: level + "Generate a C bitShift. If we can determine the result + would overflow the word size, cast to a long integer." + | rcvr arg | + rcvr := msgNode receiver. + arg := msgNode args first. + self emitCExpression: rcvr on: aStream. + (rcvr isConstant and: [arg isConstant + and: [rcvr value isInteger and: [arg value isInteger + and: [rcvr value < (1 bitShift: BytesPerWord * 8) + and: [(rcvr value bitShift: arg value) >= (1 bitShift: BytesPerWord * 8)]]]]]) ifTrue: + [aStream nextPutAll: 'LL']. - "Generate the C code for this message onto the given stream." - - self emitCExpression: msgNode receiver on: aStream. aStream nextPutAll: ' << '. + self emitCExpression: arg on: aStream! - self emitCExpression: msgNode args first on: aStream.! Item was changed: ----- Method: CoInterpreter>>readImageFromFile:HeapSize:StartingAt: (in category 'image save/restore') ----- readImageFromFile: f HeapSize: desiredHeapSize StartingAt: imageOffset "Read an image from the given file stream, allocating the given amount of memory to its object heap. Fail if the image has an unknown format or requires more than the given amount of memory." "Details: This method detects when the image was stored on a machine with the opposite byte ordering from this machine and swaps the bytes automatically. Furthermore, it allows the header information to start 512 bytes into the file, since some file transfer programs for the Macintosh apparently prepend a Mac-specific header of this size. Note that this same 512 bytes of prefix area could also be used to store an exec command on Unix systems, allowing one to launch Smalltalk by invoking the image name as a command." "This code is based on C code by Ian Piumarta and Smalltalk code by Tim Rowledge. Many thanks to both of you!!!!" | swapBytes headerStart headerSize dataSize oldBaseAddr + minimumMemory heapSize bytesRead bytesToShift firstSegSize + hdrNumStackPages hdrEdenBytes hdrCogCodeSize headerFlags hdrMaxExtSemTabSize | - minimumMemory heapSize bytesRead bytesToShift - hdrNumStackPages hdrEdenBytes hdrCogCodeSize headerFlags hdrMaxExtSemTabSize firstSegSize | <var: #f type: #sqImageFile> <var: #dataSize type: #'size_t'> <var: #desiredHeapSize type: #usqInt> <var: #headerStart type: #squeakFileOffsetType> <var: #imageOffset type: #squeakFileOffsetType> metaclassNumSlots := 6. "guess Metaclass instSize" classNameIndex := 6. "guess (Class instVarIndexFor: 'name' ifAbsent: []) - 1" swapBytes := self checkImageVersionFrom: f startingAt: imageOffset. headerStart := (self sqImageFilePosition: f) - BytesPerWord. "record header start position" headerSize := self getLongFromFile: f swap: swapBytes. dataSize := self getLongFromFile: f swap: swapBytes. oldBaseAddr := self getLongFromFile: f swap: swapBytes. objectMemory specialObjectsOop: (self getLongFromFile: f swap: swapBytes). objectMemory lastHash: (self getLongFromFile: f swap: swapBytes). "N.B. not used." savedWindowSize := self getLongFromFile: f swap: swapBytes. headerFlags := self getLongFromFile: f swap: swapBytes. self setImageHeaderFlagsFrom: headerFlags. extraVMMemory := self getLongFromFile: f swap: swapBytes. "N.B. not used." hdrNumStackPages := self getShortFromFile: f swap: swapBytes. "4 stack pages is small. Should be able to run with as few as three. 4 should be comfortable but slow. 8 is a reasonable default. Can be changed via vmParameterAt: 43 put: n. Can be set as a preference (Info.plist, VM.ini, command line etc). If desiredNumStackPages is already non-zero then it has been set as a preference. Ignore (but preserve) the header's default." numStackPages := desiredNumStackPages ~= 0 ifTrue: [desiredNumStackPages] ifFalse: [hdrNumStackPages = 0 ifTrue: [self defaultNumStackPages] ifFalse: [hdrNumStackPages]]. desiredNumStackPages := hdrNumStackPages. "This slot holds the size of the native method zone in 1k units. (pad to word boundary)." hdrCogCodeSize := (self getShortFromFile: f swap: swapBytes) * 1024. cogCodeSize := desiredCogCodeSize ~= 0 ifTrue: [desiredCogCodeSize] ifFalse: [hdrCogCodeSize = 0 ifTrue: [self defaultCogCodeSize] ifFalse: [hdrCogCodeSize]]. hdrEdenBytes := self getLongFromFile: f swap: swapBytes. objectMemory edenBytes: (desiredEdenBytes ~= 0 ifTrue: [desiredEdenBytes] ifFalse: [hdrEdenBytes = 0 ifTrue: [objectMemory defaultEdenBytes] ifFalse: [hdrEdenBytes]]). desiredEdenBytes := hdrEdenBytes. hdrMaxExtSemTabSize := self getShortFromFile: f swap: swapBytes. hdrMaxExtSemTabSize ~= 0 ifTrue: [self setMaxExtSemSizeTo: hdrMaxExtSemTabSize]. "pad to word boundary. This slot can be used for anything else that will fit in 16 bits. Preserve it to be polite to other VMs." the2ndUnknownShort := self getShortFromFile: f swap: swapBytes. firstSegSize := self getLongFromFile: f swap: swapBytes. objectMemory firstSegmentSize: firstSegSize. "compare memory requirements with availability" minimumMemory := cogCodeSize "no need to include the stackZone; this is alloca'ed" + dataSize + objectMemory newSpaceBytes + self interpreterAllocationReserveBytes. heapSize := cogCodeSize "no need to include the stackZone; this is alloca'ed" + desiredHeapSize "+ edenBytes" "don't include edenBytes; this is part of the heap and so part of desiredHeapSize" + self interpreterAllocationReserveBytes. heapSize < minimumMemory ifTrue: [self insufficientMemorySpecifiedError]. "allocate a contiguous block of memory for the Squeak heap and ancilliary data structures" objectMemory memory: (self allocateMemory: heapSize minimum: minimumMemory imageFile: f headerSize: headerSize) asUnsignedInteger. + objectMemory memory ifNil: [self insufficientMemoryAvailableError]. - - objectMemory memory = nil ifTrue: [self insufficientMemoryAvailableError]. - heapBase := objectMemory memory + cogCodeSize. - self assert: objectMemory startOfMemory = heapBase. - objectMemory - setHeapBase: heapBase - memoryLimit: objectMemory memory + heapSize - 24 "decrease memoryLimit a tad for safety (?!!?!!? eem eem 10/9/2013 15:15)" - endOfMemory: heapBase + dataSize. + heapBase := objectMemory + setHeapBase: objectMemory memory + memoryLimit: objectMemory memory + heapSize + endOfMemory: objectMemory memory + dataSize. + "position file after the header" self sqImageFile: f Seek: headerStart + headerSize. "read in the image in bulk, then swap the bytes if necessary" bytesRead := objectMemory readHeapFromImageFile: f dataBytes: dataSize. bytesRead ~= dataSize ifTrue: [self unableToReadImageError]. self ensureImageFormatIsUpToDate: swapBytes. "compute difference between old and new memory base addresses" bytesToShift := objectMemory memoryBaseForImageRead - oldBaseAddr. self initializeInterpreter: bytesToShift. "adjusts all oops to new location" self initializeCodeGenerator. ^dataSize! Item was removed: - ----- Method: CogVMSimulator>>heapBase: (in category 'accessing') ----- - heapBase: anObject - "Set the value of heapBase; used by the Spur CoSimulator to reposition cog code between newSpace and oldSpace." - - ^heapBase := anObject! Item was changed: ----- Method: CogVMSimulator>>openOn:extraMemory: (in category 'initialization') ----- openOn: fileName extraMemory: extraBytes "CogVMSimulator new openOn: 'clone.im' extraMemory: 100000" | f version headerSize count heapSize oldBaseAddr bytesToShift swapBytes hdrNumStackPages hdrEdenBytes hdrCogCodeSize stackZoneSize methodCacheSize headerFlags primTraceLogSize firstSegSize hdrMaxExtSemTabSize | "open image file and read the header" ["begin ensure block..." f := FileStream readOnlyFileNamed: fileName. imageName := f fullName. f binary. version := self nextLongFrom: f. "current version: 16r1968 (=6504) vive la revolucion!!" (self readableFormat: version) ifTrue: [swapBytes := false] ifFalse: [(version := objectMemory byteSwapped: version) = self imageFormatVersion ifTrue: [swapBytes := true] ifFalse: [self error: 'incomaptible image format']]. headerSize := self getLongFromFile: f swap: swapBytes. heapSize := self getLongFromFile: f swap: swapBytes. "length of heap in file" oldBaseAddr := self getLongFromFile: f swap: swapBytes. "object memory base address of image" objectMemory specialObjectsOop: (self getLongFromFile: f swap: swapBytes). objectMemory lastHash: (self getLongFromFile: f swap: swapBytes). "Should be loaded from, and saved to the image header" savedWindowSize := self getLongFromFile: f swap: swapBytes. headerFlags := self getLongFromFile: f swap: swapBytes. self setImageHeaderFlagsFrom: headerFlags. extraVMMemory := self getLongFromFile: f swap: swapBytes. hdrNumStackPages := self getShortFromFile: f swap: swapBytes. "4 stack pages is small. Should be able to run with as few as three. 4 should be comfortable but slow. 8 is a reasonable default. Can be changed via vmParameterAt: 43 put: n" numStackPages := desiredNumStackPages ~= 0 ifTrue: [desiredNumStackPages] ifFalse: [hdrNumStackPages = 0 ifTrue: [self defaultNumStackPages] ifFalse: [hdrNumStackPages]]. desiredNumStackPages := hdrNumStackPages. stackZoneSize := self computeStackZoneSize. "This slot holds the size of the native method zone in 1k units. (pad to word boundary)." hdrCogCodeSize := (self getShortFromFile: f swap: swapBytes) * 1024. cogCodeSize := desiredCogCodeSize ~= 0 ifTrue: [desiredCogCodeSize] ifFalse: [hdrCogCodeSize = 0 ifTrue: [self defaultCogCodeSize] ifFalse: [hdrCogCodeSize]]. desiredCogCodeSize := hdrCogCodeSize. self assert: f position = 40. hdrEdenBytes := self getLongFromFile: f swap: swapBytes. objectMemory edenBytes: (desiredEdenBytes ~= 0 ifTrue: [desiredEdenBytes] ifFalse: [hdrEdenBytes = 0 ifTrue: [objectMemory defaultEdenBytes] ifFalse: [hdrEdenBytes]]). desiredEdenBytes := hdrEdenBytes. hdrMaxExtSemTabSize := self getShortFromFile: f swap: swapBytes. hdrMaxExtSemTabSize ~= 0 ifTrue: [self setMaxExtSemSizeTo: hdrMaxExtSemTabSize]. "pad to word boundary. This slot can be used for anything else that will fit in 16 bits. Preserve it to be polite to other VMs." the2ndUnknownShort := self getShortFromFile: f swap: swapBytes. self assert: f position = 48. firstSegSize := self getLongFromFile: f swap: swapBytes. objectMemory firstSegmentSize: firstSegSize. "For Open PICs to be able to probe the method cache during simulation the methodCache must be relocated to memory." methodCacheSize := methodCache size * BytesPerWord. primTraceLogSize := primTraceLog size * BytesPerWord. "allocate interpreter memory. This list is in address order, low to high. In the actual VM the stack zone exists on the C stack." heapBase := (Cogit guardPageSize + cogCodeSize + stackZoneSize + methodCacheSize + primTraceLogSize + self rumpCStackSize) roundUpTo: objectMemory allocationUnit. + heapBase := objectMemory + setHeapBase: heapBase + memoryLimit: heapBase + + heapSize + + objectMemory newSpaceBytes + + self interpreterAllocationReserveBytes + + extraBytes + endOfMemory: heapBase + heapSize. - objectMemory - setHeapBase: heapBase - memoryLimit: heapBase - + heapSize - + objectMemory newSpaceBytes - + self interpreterAllocationReserveBytes - + extraBytes - endOfMemory: heapBase + heapSize. self assert: cogCodeSize \\ 4 = 0. self assert: objectMemory memoryLimit \\ 4 = 0. self assert: self rumpCStackSize \\ 4 = 0. "read in the image in bulk, then swap the bytes if necessary" f position: headerSize. objectMemory memory: ((cogit processor endianness == #little ifTrue: [LittleEndianBitmap] ifFalse: [Bitmap]) new: objectMemory memoryLimit // 4). count := objectMemory readHeapFromImageFile: f dataBytes: heapSize. count ~= heapSize ifTrue: [self halt]. ] ensure: [f close]. self moveMethodCacheToMemoryAt: objectMemory cogCodeBase + cogCodeSize + stackZoneSize. self movePrimTraceLogToMemoryAt: objectMemory cogCodeBase + cogCodeSize + stackZoneSize + methodCacheSize. self ensureImageFormatIsUpToDate: swapBytes. bytesToShift := objectMemory memoryBaseForImageRead - oldBaseAddr. "adjust pointers for zero base address" Utilities informUser: 'Relocating object pointers...' during: [self initializeInterpreter: bytesToShift]. self initializeCodeGenerator! Item was changed: ----- Method: Cogit>>checkMaybeObjRefAt: (in category 'garbage collection') ----- checkMaybeObjRefAt: mcpc | maybeObject | maybeObject := backEnd literalBeforeFollowingAddress: mcpc. + maybeObject = 0 ifTrue: + [^true]. (objectRepresentation couldBeObject: maybeObject) ifFalse: [^true]. ^objectRepresentation checkValidObjectReference: maybeObject! Item was changed: ----- Method: InterpreterPrimitives>>primitiveFullGC (in category 'memory space primitives') ----- primitiveFullGC + "Do a full garbage collection. In SqueakV3ObjectMemory, answer the number + of bytes available (including swap space if dynamic memory management is + supported). In Spur, answer the size of the largest free chunk." - "Do a full garbage collection and return the number of bytes available (including swap space if dynamic memory management is supported)." + objectMemory hasSpurMemoryManagerAPI ifTrue: + [^self pop: 1 thenPushInteger: objectMemory fullGC]. objectMemory fullGCLock > 0 ifTrue: [^self primitiveFailFor: PrimErrInappropriate]. + objectMemory incrementalGC. "maximimize space for forwarding table" - objectMemory hasSpurMemoryManagerAPI ifFalse: - [objectMemory incrementalGC]. "maximimize space for forwarding table" objectMemory fullGC. + self pop: 1 thenPushInteger: (objectMemory bytesLeft: true)! - self pop: 1 thenPushInteger: (objectMemory bytesLeft: true).! Item was added: + ----- Method: InterpreterPrimitives>>primitiveSizeInBytes (in category 'memory space primitives') ----- + primitiveSizeInBytes + <option: #SpurObjectMemory> + self pop: argumentCount + 1 + thenPushInteger: (objectMemory totalByteSizeOf: self stackTop)! Item was added: + ----- Method: InterpreterPrimitives>>primitiveSizeInBytesOfInstance (in category 'memory space primitives') ----- + primitiveSizeInBytesOfInstance + <option: #SpurObjectMemory> + | byteSizeOrErr | + argumentCount > 1 ifTrue: + [^self primitiveFailFor: PrimErrBadNumArgs]. + argumentCount = 1 ifTrue: + [(objectMemory isIntegerObject: self stackTop) ifFalse: + [^self primitiveFailFor: PrimErrBadArgument]. + byteSizeOrErr := objectMemory + byteSizeOfInstanceOf: (self stackValue: 1) + withIndexableSlots: (objectMemory integerValueOf: self stackTop). + byteSizeOrErr < 0 ifTrue: + [^self primitiveFailFor: byteSizeOrErr negated]. + ^self pop: 2 thenPushInteger: byteSizeOrErr]. + byteSizeOrErr := objectMemory byteSizeOfInstanceOf: (self stackValue: 1). + byteSizeOrErr < 0 ifTrue: + [^self primitiveFailFor: byteSizeOrErr negated]. + self pop: 1 thenPushInteger: byteSizeOrErr! Item was changed: ----- Method: ObjectMemory>>setHeapBase:memoryLimit:endOfMemory: (in category 'initialization') ----- + setHeapBase: heapBase memoryLimit: memLimit endOfMemory: memEnd + "Set the dimentions of the heap, answering the start of oldSpace." - setHeapBase: ignored memoryLimit: memLimit endOfMemory: memEnd self setMemoryLimit: memLimit. + self setEndOfMemory: memEnd. + ^heapBase! - self setEndOfMemory: memEnd! Item was changed: ----- Method: Spur32BitCoMemoryManager>>setHeapBase:memoryLimit:endOfMemory: (in category 'snapshot') ----- setHeapBase: baseOfHeap memoryLimit: memLimit endOfMemory: memEnd + "Set the dimensions of the heap, answering the start of oldSpace. + Override to position oldSpace above the cog code zone." super setHeapBase: baseOfHeap memoryLimit: memLimit endOfMemory: memEnd. + ^oldSpaceStart := newSpaceLimit + coInterpreter cogCodeSize! - oldSpaceStart := newSpaceLimit + coInterpreter cogCodeSize! Item was changed: ----- Method: Spur32BitMMLECoSimulator>>setHeapBase:memoryLimit:endOfMemory: (in category 'initialization') ----- setHeapBase: baseOfHeap memoryLimit: memLimit endOfMemory: memEnd + "Set the dimensions of the heap, answering the start of oldSpace. + Override to add a guard page beneath the heap." + "As invoked by CogVMSimulator>>openOn:extraBytes: baseOfHeap contains the combined - "As invoced by CogVMSimulator>>openOn:extraBytes: baseOfHeap contains the combined zone sizes for cog methods, stack zone, etc. The memory map in SqueakV3 looks like 0: cogCode stackZone methodCache primTraceLog rumpCStack heapBase: nilObj etc But here in Spur we want + 0: guardPage + guardPageSize: + newSpace: + past/future survivor space + past/future survivor space + eden - 0: (newSpace): - past/future survivor space - past/future survivor space - eden M: cogCode stackZone methodCache primTraceLog rumpCStack heapBase: nilObj etc" super setHeapBase: Cogit guardPageSize memoryLimit: memLimit endOfMemory: memEnd. + ^oldSpaceStart := newSpaceLimit + baseOfHeap! - oldSpaceStart := newSpaceLimit + baseOfHeap. - coInterpreter heapBase: oldSpaceStart.! Item was changed: ----- Method: SpurMemoryManager>>allocateMemoryOfSize:newSpaceSize:stackSize:codeSize: (in category 'spur bootstrap') ----- allocateMemoryOfSize: memoryBytes newSpaceSize: newSpaceBytes stackSize: stackBytes codeSize: codeBytes "Intialize the receiver for bootsraping an image. Set up a large oldSpace and an empty newSpace and set-up freeStart and scavengeThreshold to allocate in oldSpace. Later on (in initializePostBootstrap) freeStart and scavengeThreshold will be set to sane values." <doNotGenerate> self assert: (memoryBytes \\ self allocationUnit = 0 and: [newSpaceBytes \\ self allocationUnit = 0 and: [codeBytes \\ self allocationUnit = 0]]). memory := (self endianness == #little ifTrue: [LittleEndianBitmap] ifFalse: [Bitmap]) new: (memoryBytes + newSpaceBytes + codeBytes + stackBytes) // 4. "N.B. This layout does NOT reflect the layout of SpurCoMemoryManager" newSpaceStart := codeBytes + stackBytes. endOfMemory := freeOldSpaceStart := memoryBytes + newSpaceBytes + codeBytes + stackBytes. "leave newSpace empty for the bootstrap" freeStart := newSpaceBytes + newSpaceStart. + oldSpaceStart := newSpaceLimit := newSpaceBytes + newSpaceStart. - newSpaceLimit := newSpaceBytes + newSpaceStart. scavengeThreshold := memory size * 4. "Bitmap is a 4-byte per word array" scavenger := SpurGenerationScavengerSimulator new. scavenger manager: self. scavenger newSpaceStart: newSpaceStart newSpaceBytes: newSpaceBytes edenBytes: newSpaceBytes * self scavengerDenominator - self numSurvivorSpaces // self scavengerDenominator! Item was added: + ----- Method: SpurMemoryManager>>byteSizeOfInstanceOf: (in category 'indexing primitive support') ----- + byteSizeOfInstanceOf: classObj + | instSpec classFormat numSlots | + classFormat := self formatOfClass: classObj. + instSpec := self instSpecOfClassFormat: classFormat. + (self isFixedSizePointerFormat: instSpec) ifFalse: + [^PrimErrBadReceiver negated]. "indexable" + numSlots := self fixedFieldsOfClassFormat: classFormat. + ^self objectBytesForSlots: numSlots! Item was added: + ----- Method: SpurMemoryManager>>byteSizeOfInstanceOf:withIndexableSlots: (in category 'indexing primitive support') ----- + byteSizeOfInstanceOf: classObj withIndexableSlots: nElements + | instSpec classFormat numSlots | + classFormat := self formatOfClass: classObj. + instSpec := self instSpecOfClassFormat: classFormat. + instSpec caseOf: { + [self arrayFormat] -> + [numSlots := nElements]. + [self indexablePointersFormat] -> + [numSlots := (self fixedFieldsOfClassFormat: classFormat) + nElements]. + [self weakArrayFormat] -> + [numSlots := (self fixedFieldsOfClassFormat: classFormat) + nElements]. + [self sixtyFourBitIndexableFormat] -> + [numSlots := self wordSize = 4 ifTrue: [nElements * 2] ifFalse: [nElements]]. + [self firstLongFormat] -> + [numSlots := self wordSize = 4 ifTrue: [nElements] ifFalse: [nElements + 1 // 2]]. + [self firstShortFormat] -> + [numSlots := self wordSize = 4 ifTrue: [nElements + 1 // 2] ifFalse: [nElements + 3 // 4]]. + [self firstByteFormat] -> + [numSlots := nElements + (self wordSize - 1) // self wordSize] } + otherwise: [^PrimErrBadReceiver negated]. "non-indexable or CompiledMethod" + ^self objectBytesForSlots: numSlots! Item was changed: ----- Method: SpurMemoryManager>>fullGC (in category 'gc - global') ----- fullGC + "Perform a full lazy compacting GC. Answer the size of the largest free chunk." <inline: false> needGCFlag := false. gcStartUsecs := self ioUTCMicrosecondsNow. statMarkCount := 0. coInterpreter preGCAction: GCModeFull. self globalGarbageCollect. coInterpreter postGCAction: GCModeFull. statFullGCs := statFullGCs + 1. statGCEndUsecs := self ioUTCMicrosecondsNow. + statFullGCUsecs := statFullGCUsecs + (statGCEndUsecs - gcStartUsecs). + ^(freeLists at: 0) ~= 0 + ifTrue: [self bytesInObject: self findLargestFreeChunk] + ifFalse: [0]! - statFullGCUsecs := statFullGCUsecs + (statGCEndUsecs - gcStartUsecs).! Item was changed: ----- Method: SpurMemoryManager>>setHeapBase:memoryLimit:endOfMemory: (in category 'snapshot') ----- setHeapBase: baseOfHeap memoryLimit: memLimit endOfMemory: memEnd + "Set the dimensions of the heap, answering the start of oldSpace." "Transcript cr; nextPutAll: 'heapBase: '; print: baseOfHeap; nextPut: $/; nextPutAll: baseOfHeap hex; nextPutAll: ' memLimit '; print: memLimit; nextPut: $/; nextPutAll: memLimit hex; nextPutAll: ' memEnd '; print: memEnd; nextPut: $/; nextPutAll: memEnd hex; cr; flush." "This is a little counter-intuitive. Eden must include interpreterAllocationReserveBytes." newSpaceStart := baseOfHeap. newSpaceLimit := baseOfHeap + self newSpaceBytes + coInterpreter interpreterAllocationReserveBytes. scavenger newSpaceStart: newSpaceStart newSpaceBytes: newSpaceLimit - newSpaceStart edenBytes: newSpaceLimit - newSpaceStart * (self scavengerDenominator - self numSurvivorSpaces) // self scavengerDenominator. freeStart := scavenger eden start. pastSpaceStart := scavenger pastSpace start. freeOldSpaceStart := memEnd. endOfMemory := memLimit. + oldSpaceStart := newSpaceLimit. + ^oldSpaceStart! - oldSpaceStart := newSpaceLimit! Item was added: + ----- Method: SpurMemoryManager>>totalByteSizeOf: (in category 'indexing primitive support') ----- + totalByteSizeOf: oop + ^(self isImmediate: oop) + ifTrue: [0] + ifFalse: [self bytesInObject: oop]! Item was changed: ----- Method: StackInterpreter class>>initializePrimitiveTable (in category 'initialization') ----- (excessive size, no diff calculated) Item was changed: ----- Method: StackInterpreter>>printOopShortInner: (in category 'debug printing') ----- printOopShortInner: oop | classOop name nameLen | <var: #name type: #'char *'> <inline: true> (objectMemory isImmediate: oop) ifTrue: [(objectMemory isImmediateCharacter: oop) ifTrue: + [^self + printChar: $$; - [self printChar: $$; printChar: (objectMemory characterValueOf: oop); printChar: $(; printHex: (objectMemory integerValueOf: oop); + printChar: $)]. + ^self + printNum: (objectMemory integerValueOf: oop); - printChar: $). - ^nil]. - self printNum: (objectMemory integerValueOf: oop); printChar: $(; printHex: (objectMemory integerValueOf: oop); + printChar: $)]. - printChar: $). - ^nil]. (objectMemory addressCouldBeObj: oop) ifFalse: + [^self print: ((oop bitAnd: objectMemory allocationUnit - 1) ~= 0 - [self print: ((oop bitAnd: objectMemory allocationUnit - 1) ~= 0 ifTrue: [' is misaligned'] + ifFalse: [' is not on the heap'])]. - ifFalse: [' is not on the heap']); cr. - ^nil]. (self isFloatObject: oop) ifTrue: + [^self printFloat: (self dbgFloatValueOf: oop)]. - [self printFloat: (self dbgFloatValueOf: oop). - ^nil]. classOop := objectMemory fetchClassOfNonImm: oop. (objectMemory addressCouldBeObj: classOop) ifFalse: + [^self print: 'a ??']. - [self print: 'a ??'. ^nil]. (objectMemory numSlotsOf: classOop) = metaclassNumSlots ifTrue: + [^self printNameOfClass: oop count: 5]. + oop = objectMemory nilObject ifTrue: [^self print: 'nil']. + oop = objectMemory trueObject ifTrue: [^self print: 'true']. + oop = objectMemory falseObject ifTrue: [^self print: 'false']. - [self printNameOfClass: oop count: 5. - ^nil]. - oop = objectMemory nilObject ifTrue: [self print: 'nil'. ^nil]. - oop = objectMemory trueObject ifTrue: [self print: 'true'. ^nil]. - oop = objectMemory falseObject ifTrue: [self print: 'false'. ^nil]. nameLen := self lengthOfNameOfClass: classOop. + nameLen = 0 ifTrue: [^self print: 'a ??']. - nameLen = 0 ifTrue: [self print: 'a ??'. ^nil]. name := self nameOfClass: classOop. nameLen = 10 ifTrue: [(self str: name n: 'ByteString' cmp: 10) not "strncmp is weird" ifTrue: + [^self printChar: $'; printStringOf: oop; printChar: $']. - [self printChar: $'; printStringOf: oop; printChar: $'. - ^nil]. (self str: name n: 'ByteSymbol' cmp: 10) not "strncmp is weird" ifTrue: + [self printChar: $#; printStringOf: oop. ^self]]. - [self printChar: $#; printStringOf: oop. - ^nil]]. (nameLen = 9 and: [(self str: name n: 'Character' cmp: 9) not]) ifTrue: + [^self printChar: $$; printChar: (objectMemory integerValueOf: (objectMemory fetchPointer: 0 ofObject: oop))]. - [self printChar: $$; printChar: (objectMemory integerValueOf: (objectMemory fetchPointer: 0 ofObject: oop)). - ^nil]. self print: 'a(n) '. self cCode: [0 to: nameLen - 1 do: [:i| self printChar: (name at: i)]] inSmalltalk: [name isString ifTrue: [self print: name] ifFalse: [0 to: nameLen - 1 do: [:i| self printChar: (name at: i)]]]. "Try to spot association-like things; they're all subclasses of LookupKey" ((objectMemory instanceSizeOf: classOop) = (ValueIndex + 1) and: [(self superclassOf: classOop) = (self superclassOf: (objectMemory fetchClassOfNonImm: (objectMemory splObj: SchedulerAssociation))) and: [objectMemory isBytes: (objectMemory fetchPointer: KeyIndex ofObject: oop)]]) ifTrue: [self space; printOopShort: (objectMemory fetchPointer: KeyIndex ofObject: oop); print: ' -> '; printHex: (objectMemory fetchPointer: ValueIndex ofObject: oop)]! Item was changed: ----- Method: StackInterpreter>>readImageFromFile:HeapSize:StartingAt: (in category 'image save/restore') ----- readImageFromFile: f HeapSize: desiredHeapSize StartingAt: imageOffset "Read an image from the given file stream, allocating the given amount of memory to its object heap. Fail if the image has an unknown format or requires more than the given amount of memory." "Details: This method detects when the image was stored on a machine with the opposite byte ordering from this machine and swaps the bytes automatically. Furthermore, it allows the header information to start 512 bytes into the file, since some file transfer programs for the Macintosh apparently prepend a Mac-specific header of this size. Note that this same 512 bytes of prefix area could also be used to store an exec command on Unix systems, allowing one to launch Smalltalk by invoking the image name as a command." "This code is based on C code by Ian Piumarta and Smalltalk code by Tim Rowledge. Many thanks to both of you!!!!" + | headerStart headerSize headerFlags dataSize oldBaseAddr swapBytes + minimumMemory bytesRead bytesToShift heapSize firstSegSize + hdrEdenBytes hdrMaxExtSemTabSize hdrNumStackPages | - | swapBytes headerStart headerSize dataSize oldBaseAddr hdrNumStackPages - minimumMemory heapBase bytesRead bytesToShift heapSize hdrEdenBytes - headerFlags hdrMaxExtSemTabSize firstSegSize | <var: #f type: #sqImageFile> <var: #dataSize type: #'size_t'> - <var: #heapBase type: #usqInt> <var: #desiredHeapSize type: #usqInt> <var: #headerStart type: #squeakFileOffsetType> <var: #imageOffset type: #squeakFileOffsetType> metaclassNumSlots := 6. "guess Metaclass instSize" classNameIndex := 6. "guess (Class instVarIndexFor: 'name' ifAbsent: []) - 1" swapBytes := self checkImageVersionFrom: f startingAt: imageOffset. headerStart := (self sqImageFilePosition: f) - BytesPerWord. "record header start position" headerSize := self getLongFromFile: f swap: swapBytes. dataSize := self getLongFromFile: f swap: swapBytes. oldBaseAddr := self getLongFromFile: f swap: swapBytes. objectMemory specialObjectsOop: (self getLongFromFile: f swap: swapBytes). objectMemory lastHash: (self getLongFromFile: f swap: swapBytes). "N.B. not used." savedWindowSize := self getLongFromFile: f swap: swapBytes. headerFlags := self getLongFromFile: f swap: swapBytes. self setImageHeaderFlagsFrom: headerFlags. extraVMMemory := self getLongFromFile: f swap: swapBytes. hdrNumStackPages := self getShortFromFile: f swap: swapBytes. "4 stack pages is small. Should be able to run with as few as three. 4 should be comfortable but slow. 8 is a reasonable default. Can be changed via vmParameterAt: 43 put: n. Can be set as a preference (Info.plist, VM.ini, command line etc). If desiredNumStackPages is already non-zero then it has been set as a preference. Ignore (but preserve) the header's default." numStackPages := desiredNumStackPages ~= 0 ifTrue: [desiredNumStackPages] ifFalse: [hdrNumStackPages = 0 ifTrue: [self defaultNumStackPages] ifFalse: [hdrNumStackPages]]. desiredNumStackPages := hdrNumStackPages. "pad to word boundary. This slot can be used for anything else that will fit in 16 bits. It is used for the cog code size in Cog. Preserve it to be polite to other VMs." theUnknownShort := self getShortFromFile: f swap: swapBytes. hdrEdenBytes := self getLongFromFile: f swap: swapBytes. objectMemory edenBytes: (desiredEdenBytes ~= 0 ifTrue: [desiredEdenBytes] ifFalse: [hdrEdenBytes = 0 ifTrue: [objectMemory defaultEdenBytes] ifFalse: [hdrEdenBytes]]). desiredEdenBytes := hdrEdenBytes. hdrMaxExtSemTabSize := self getShortFromFile: f swap: swapBytes. hdrMaxExtSemTabSize ~= 0 ifTrue: [self setMaxExtSemSizeTo: hdrMaxExtSemTabSize]. "pad to word boundary. This slot can be used for anything else that will fit in 16 bits. Preserve it to be polite to other VMs." the2ndUnknownShort := self getShortFromFile: f swap: swapBytes. firstSegSize := self getLongFromFile: f swap: swapBytes. objectMemory firstSegmentSize: firstSegSize. "decrease Squeak object heap to leave extra memory for the VM" heapSize := desiredHeapSize + objectMemory newSpaceBytes + self interpreterAllocationReserveBytes. heapSize := self reserveExtraCHeap: heapSize Bytes: extraVMMemory. "compare memory requirements with availability". minimumMemory := dataSize + objectMemory newSpaceBytes + self interpreterAllocationReserveBytes. heapSize < minimumMemory ifTrue: [self insufficientMemorySpecifiedError]. "allocate a contiguous block of memory for the Squeak heap" objectMemory memory: (self allocateMemory: heapSize minimum: minimumMemory imageFile: f headerSize: headerSize) asUnsignedInteger. + objectMemory memory ifNil: [self insufficientMemoryAvailableError]. - objectMemory memory = nil ifTrue: [self insufficientMemoryAvailableError]. - heapBase := objectMemory memory. objectMemory + setHeapBase: objectMemory memory + memoryLimit: objectMemory memory + heapSize + endOfMemory: objectMemory memory + dataSize. - setHeapBase: heapBase - memoryLimit: (heapBase + heapSize) - 24 "decrease memoryLimit a tad for safety" - endOfMemory: heapBase + dataSize. "position file after the header" self sqImageFile: f Seek: headerStart + headerSize. "read in the image in bulk, then swap the bytes if necessary" bytesRead := objectMemory readHeapFromImageFile: f dataBytes: dataSize. bytesRead ~= dataSize ifTrue: [self unableToReadImageError]. self ensureImageFormatIsUpToDate: swapBytes. "compute difference between old and new memory base addresses" bytesToShift := objectMemory memoryBaseForImageRead - oldBaseAddr. self initializeInterpreter: bytesToShift. "adjusts all oops to new location" ^dataSize! Item was changed: ----- Method: StackInterpreterPrimitives>>primitiveFullGC (in category 'memory space primitives') ----- primitiveFullGC + "Do a full garbage collection. In SqueakV3ObjectMemory, answer the number + of bytes available (including swap space if dynamic memory management is + supported). In Spur, answer the size of the largest free chunk." - "Do a full garbage collection and return the number of bytes available. - If on SqueakV3ObjectMemory include swap space if dynamic memory - management is supported." - objectMemory fullGCLock > 0 ifTrue: - [^self primitiveFailFor: PrimErrInappropriate]. self externalWriteBackHeadFramePointers. + super primitiveFullGC! - objectMemory hasSpurMemoryManagerAPI ifFalse: - [objectMemory incrementalGC]. "maximimize space for forwarding table" - objectMemory fullGC. - "In Spur we exclude swap space." - self pop: 1 - thenPushInteger: (objectMemory hasSpurMemoryManagerAPI - ifTrue: [objectMemory bytesLeftInOldSpace] - ifFalse: [objectMemory bytesLeft: true])!

1 0

VM Maker: Cog-eem.123.mcz
by commits＠source.squeak.org 25 Nov '13

25 Nov '13

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.123.mcz ==================== Summary ==================== Name: Cog-eem.123 Author: eem Time: 25 November 2013, 12:53:46.988 pm UUID: 3390bef4-24bf-4728-94a2-c94df99e1e2a Ancestors: Cog-eem.122 Fix Behavior>>handleFailingBasicNew: in the Spur bootastrap by redefining primitiveGarbageCollect to answer the byte size of the largest free chunk, rather than the total ammount of free space, and by adding Behavior>>byteSizeOfInstanceWithIndexableVariables:. Fix the bootstrap to not waste memory allocating an unused code zone. =============== Diff against Cog-eem.122 =============== Item was added: + ----- Method: SpurBootstrap class>>BehaviorPROTOTYPEbyteSizeOfInstance (in category 'method prototypes') ----- + BehaviorPROTOTYPEbyteSizeOfInstance + "Answer the total memory size of an instance of the receiver." + + <primitive: 181> + self isVariable ifTrue: + [^self byteSizeOfInstanceWithIndexableVariables: 0]. + self primitiveFailed! Item was added: + ----- Method: SpurBootstrap class>>BehaviorPROTOTYPEbyteSizeOfInstanceWithIndexableVariables: (in category 'method prototypes') ----- + BehaviorPROTOTYPEbyteSizeOfInstanceWithIndexableVariables: sizeRequested + "Answer the total memory size of an instance of the receiver + with the given number of indexable instance variables." + + <primitive: 181> + self isVariable ifFalse: + [sizeRequested = 0 ifTrue: + [^self byteSizeOfInstance]]. + self primitiveFailed! Item was changed: ----- 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 < 1048576 ifTrue: [Smalltalk growMemoryByAtLeast: 1048576]. ^self handleFailingFailingBasicNew "retry after global garbage collect"! Item was changed: ----- 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 handleFailingBasicNew: 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> + | bytesRequested | + bytesRequested := self byteSizeOfInstanceWithIndexableVariables: sizeRequested. + Smalltalk garbageCollect < bytesRequested ifTrue: + [Smalltalk growMemoryByAtLeast: bytesRequested]. + "retry after global garbage collect and possible grow" + ^self handleFailingFailingBasicNew: sizeRequested! - self isVariable ifFalse: - [self error: self printString, ' cannot have variable sized instances']. - (sizeRequested isInteger and: [sizeRequested >= 0]) ifTrue: - [Smalltalk garbageCollect < sizeRequested ifTrue: - [Smalltalk growMemoryByAtLeast: sizeRequested * self elementSize]. - ^self handleFailingFailingBasicNew: sizeRequested "retry after global garbage collect and possible grow"]. - self primitiveFailed! Item was changed: ----- 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 changed: ----- 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> + "arg okay; space must be low." + OutOfMemory signal. + ^self basicNew: sizeRequested "retry if user proceeds"! - 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>>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) newSpaceSize: 1024 * 1024 stackSize: 1024 * 1024 + codeSize: 0. - codeSize: 1024 * 1024. newHeap setCheckForLeaks: 15 - 6. "don't check become; or newSpace; soooo many rehashes in bootstrap" 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!

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev November 2013