Vm-dev October 2014

vm-dev@lists.squeakfoundation.org

38 participants
133 discussions

VM Maker: VMMaker.oscog-eem.909.mcz
by commits＠source.squeak.org 24 Oct '14

24 Oct '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.909.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.909 Author: eem Time: 23 October 2014, 5:31:44.189 pm UUID: 0d4fb242-44a2-408b-bc90-a737cfdd364d Ancestors: VMMaker.oscog-eem.908 Oops, markStack pop order is LIFO. Explicitly put the roots array first in the reachable objects array that populates a segment. The testImageSegmentsShouldBeWritableToaFile test now succeeds and the system stays alive. =============== Diff against VMMaker.oscog-eem.908 =============== Item was changed: ----- Method: SpurMemoryManager>>objectsReachableFromRoots: (in category 'image segment in/out') ----- objectsReachableFromRoots: arrayOfRoots "Answer an Array of all the objects only reachable from the argument, an Array of root objects, starting with arrayOfRoots. If there is no space, answer a SmallInteger whose value is the number of slots required. This is used to collect the objects to include in an image segment on Spur, separate from creating the segment, hence simplifying the implementation. Thanks to Igor Stasenko for this idea." | freeChunk ptr start limit count oop objOop | self assert: (self isArray: arrayOfRoots). "Mark all objects except those only reachable from the arrayOfRoots by marking each object in arrayOfRoots and then marking all reachable objects (from the system roots). This leaves unmarked only objects reachable from the arrayOfRoots. N.B. A side-effect of the marking is that all forwarders in arrayOfRoots will be followed." self assert: self allObjectsUnmarked. self markObjectsIn: arrayOfRoots. self markObjects: false. "After the mark phase all unreachable weak slots will have been nilled and all active ephemerons fired." self assert: (self isEmptyObjStack: markStack). self assert: (self isEmptyObjStack: weaklingStack). self assert: self noUnscannedEphemerons. "Use the largest free chunk to answer the result." freeChunk := self allocateLargestFreeChunk. ptr := start := freeChunk + self baseHeaderSize. limit := self addressAfter: freeChunk. count := 0. + + "First put the arrayOfRoots; order is important." + count := count + 1. + ptr < limit ifTrue: + [self longAt: ptr put: arrayOfRoots. + ptr := ptr + self bytesPerSlot]. + - "First put the roots; order is important." - self push: arrayOfRoots onObjStack: markStack. 0 to: (self numSlotsOf: arrayOfRoots) - 1 do: [:i| oop := self fetchPointer: i ofObject: arrayOfRoots. (self isNonImmediate: oop) ifTrue: [self push: oop onObjStack: markStack]]. "Now collect the unmarked objects reachable from the roots." [self isEmptyObjStack: markStack] whileFalse: [objOop := self popObjStack: markStack. count := count + 1. ptr < limit ifTrue: [self longAt: ptr put: objOop. ptr := ptr + self bytesPerSlot]. oop := self fetchClassOfNonImm: objOop. (self isMarked: oop) ifFalse: [self setIsMarkedOf: objOop to: true. self push: oop onObjStack: markStack]. 0 to: (self numPointerSlotsOf: objOop) - 1 do: [:i| oop := self fetchPointer: i ofObject: objOop. ((self isImmediate: oop) or: [self isMarked: oop]) ifFalse: [self setIsMarkedOf: objOop to: true. self push: oop onObjStack: markStack]]]. self unmarkAllObjects. totalFreeOldSpace := totalFreeOldSpace - (self bytesInObject: freeChunk). "Now try and allocate the result" (count > (ptr - start / self bytesPerSlot) "not enough room" or: [limit ~= ptr and: [limit - ptr <= self allocationUnit]]) ifTrue: "can't split a single word" [self freeChunkWithBytes: (self bytesInObject: freeChunk) at: (self startOfObject: freeChunk). self checkFreeSpace. ^self integerObjectOf: count]. "There's room; set the format, & classIndex and shorten." self setFormatOf: freeChunk to: self arrayFormat. self setClassIndexOf: freeChunk to: ClassArrayCompactIndex. self shorten: freeChunk toIndexableSize: count. self possibleRootStoreInto: freeChunk. self checkFreeSpace. self runLeakCheckerForFullGC: false. ^freeChunk!

1 0

Run Spur run!!
by Max Leske 23 Oct '14

23 Oct '14

For those of you who missed this on IRC: henriksp: estebanlm: Care to run a small bench Cog vs Spur for me? [3:32pm] henriksp: int := ZnUTF8Encoder new. [3:32pm] henriksp: [int decodeBytes:#[67 97 115 104 44 32 108 105 107 101 32 226 130 172 44 32 105 115 32 107 105 110 103 0]] bench. [3:32pm] henriksp: had a 16x speedup with assembly implementation vs Cog, if it's 8x vs Spur, that's just really impressive [3:44pm] Craig left the chat room. (Quit: Leaving.) [3:53pm] Craig joined the chat room. [4:08pm] VitamineD joined the chat room. [4:20pm] estebanlm: checking [4:21pm] estebanlm: Cog: 167,000 per second. [4:22pm] estebanlm: Cog[Spur]: 289,000 per second. [4:23pm] estebanlm: henriksp: ping [4:33pm] tinchodias left the chat room. (Ping timeout: 245 seconds) [4:33pm] tinchodias joined the chat room. [4:34pm] henriksp: 70% more work done, nice! [5:09pm] Yay! :)

1 0

VM Maker: VMMaker.oscog-eem.908.mcz
by commits＠source.squeak.org 23 Oct '14

23 Oct '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.908.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.908 Author: eem Time: 23 October 2014, 12:11:14.104 pm UUID: e256ea16-b97f-485e-a32f-49d4254845be Ancestors: VMMaker.oscog-eem.907 Refactor the Spur image segment code into smaller methods. Collect the classes in a segment at the start of the seg, immediately following the root obj, to ease postponing adding cxlasses in th seg to the class table until after validation. Byte swap image segments in the load primitive if required, as is expected by the ImageSegment code. Print slots of word objects in longPrintOop: =============== Diff against VMMaker.oscog-eem.907 =============== Item was added: + ----- Method: Spur32BitMMLECoSimulator>>loadImageSegmentFrom:outPointers: (in category 'image segment in/out') ----- + loadImageSegmentFrom: segmentWordArray outPointers: outPointerArray + self leakCheckImageSegments ifTrue: + [self halt]. + ^super loadImageSegmentFrom: segmentWordArray outPointers: outPointerArray! Item was added: + ----- Method: Spur32BitMMLECoSimulator>>return:restoringObjectsIn:savedHashes:and:savedHashes: (in category 'image segment in/out') ----- + return: errCode restoringObjectsIn: firstArray savedHashes: firstSavedHashes and: secondArray savedHashes: secondSavedHashes + self leakCheckImageSegments ifTrue: + [self halt].. + ^super return: errCode restoringObjectsIn: firstArray savedHashes: firstSavedHashes and: secondArray savedHashes: secondSavedHashes! Item was added: + ----- Method: Spur32BitMMLECoSimulator>>storeImageSegmentInto:outPointers:roots: (in category 'image segment in/out') ----- + storeImageSegmentInto: segmentWordArray outPointers: outPointerArray roots: arrayOfRoots + self leakCheckImageSegments ifTrue: + [self halt]. + ^super storeImageSegmentInto: segmentWordArray outPointers: outPointerArray roots: arrayOfRoots! Item was changed: ----- Method: Spur32BitMMLESimulator>>loadImageSegmentFrom:outPointers: (in category 'image segment in/out') ----- loadImageSegmentFrom: segmentWordArray outPointers: outPointerArray + self leakCheckImageSegments ifTrue: + [self halt]. - self halt. ^super loadImageSegmentFrom: segmentWordArray outPointers: outPointerArray! Item was removed: - ----- Method: Spur32BitMMLESimulator>>newOutPointer:at:in:hashes:topHashBit: (in category 'object access') ----- - newOutPointer: oop at: outIndex in: outPointerArray hashes: savedOutHashes topHashBit: topHashBit - self halt. - ^super newOutPointer: oop at: outIndex in: outPointerArray hashes: savedOutHashes topHashBit: topHashBit! Item was added: + ----- Method: Spur32BitMMLESimulator>>return:restoringObjectsIn:savedHashes:and:savedHashes: (in category 'image segment in/out') ----- + return: errCode restoringObjectsIn: firstArray savedHashes: firstSavedHashes and: secondArray savedHashes: secondSavedHashes + self leakCheckImageSegments ifTrue: + [self halt: errCode printString]. + ^super return: errCode restoringObjectsIn: firstArray savedHashes: firstSavedHashes and: secondArray savedHashes: secondSavedHashes! Item was added: + ----- Method: Spur32BitMMLESimulator>>storeImageSegmentInto:outPointers:roots: (in category 'image segment in/out') ----- + storeImageSegmentInto: segmentWordArray outPointers: outPointerArray roots: arrayOfRoots + self leakCheckImageSegments ifTrue: + [self halt]. + ^super storeImageSegmentInto: segmentWordArray outPointers: outPointerArray roots: arrayOfRoots! Item was added: + ----- Method: SpurMemoryManager>>assignClassIndicesAndPinFrom:to:outPointers: (in category 'image segment in/out') ----- + assignClassIndicesAndPinFrom: segmentStart to: segmentLimit outPointers: outPointerArray + "Make a final pass, assigning class indices and/or pinning pinned objects" + | objOop topHashBit | + topHashBit := 1 bitShift: self identityHashFieldWidth - 1. + objOop := self objectStartingAt: segmentStart. + [objOop < segmentLimit] whileTrue: + [| classRef classOop classIndex | + classRef := self classIndexOf: objOop. + classOop := (classRef anyMask: topHashBit) + ifTrue: [self fetchPointer: classRef - topHashBit ofObject: outPointerArray] + ifFalse: [classRef * self allocationUnit + segmentStart]. + classIndex := self rawHashBitsOf: classOop. + self assert: (classIndex > self lastClassIndexPun + and: [(self classOrNilAtIndex: classIndex) = classOop]). + self setClassIndexOf: objOop to: classIndex. + ((self isInNewSpace: objOop) + and: [self isPinned: objOop]) ifTrue: + [| oldClone | + oldClone := self cloneInOldSpaceForPinning: objOop. + oldClone ~= 0 ifTrue: + [self setIsPinnedOf: oldClone to: true. + self forward: objOop to: oldClone]]. + objOop := self objectAfter: objOop limit: segmentLimit]. + ! Item was changed: ----- Method: SpurMemoryManager>>copyObj:toAddr:startAt:stopAt: (in category 'image segment in/out') ----- copyObj: objOop toAddr: segAddr startAt: segStart stopAt: endSeg "Copy objOop into the segment beginning at segAddr, and forward it to the copy. + If it is a class in the class table, set the copy's hash to 0 for reassignment on load, + and mark it as a class by setting its isRemembered bit. - If it is a class in the class table, set the copy's hash to 0 for reassignment on load. Answer the next segmentAddr if successful. Answer an appropriate error code if not" "Copy the object..." | bodySize copy hash newOop | <inline: false> bodySize := self bytesInObject: objOop. (self oop: segAddr + bodySize isGreaterThanOrEqualTo: endSeg) ifTrue: [^PrimErrWritePastObject]. self mem: segAddr asVoidPointer cp: (self startOfObject: objOop) asVoidPointer y: bodySize. copy := self objectStartingAt: segAddr. + "Clear remembered, mark bits of all headers copied into the segment (except classes)" - "Clear remembered, mark bits of all headers copied into the segment" self setIsRememberedOf: copy to: false; setIsMarkedOf: copy to: false. + "If the object is a class, zero its identityHash (which is its classIndex) and set its + isRemembered bit. It will be assigned a new hash and entered into the table on load." - "If the object is a class, zero its identityHash (which is its classIndex). - The class will be assigned a new hash on load." hash := self rawHashBitsOf: objOop. (hash > self lastClassIndexPun and: [(self classOrNilAtIndex: hash) = objOop]) ifTrue: + [self setHashBitsOf: copy to: 0. + self setIsRememberedOf: copy to: true]. - [self setHashBitsOf: copy to: 0]. newOop := copy - segStart / self allocationUnit. newOop > self maxIdentityHash ifTrue: [^PrimErrLimitExceeded]. self setHashBitsOf: objOop to: copy - segStart / self allocationUnit. self setIsMarkedOf: objOop to: true. "Answer the new end of segment" ^segAddr + bodySize! Item was added: + ----- Method: SpurMemoryManager>>ensureHasOverflowHeader:forwardIfCloned: (in category 'image segment in/out') ----- + ensureHasOverflowHeader: arrayArg forwardIfCloned: forwardIfCloned + "If arrayArg is too short to be truncated, clone it so that the clone is long enough. + Answer nil if it can't be cloned." + <inline: false> + (self hasOverflowHeader: arrayArg) ifTrue: + [^arrayArg]. + ^(self + allocateSlots: self numSlotsMask + 1 + format: (self formatOf: arrayArg) + classIndex: (self classIndexOf: arrayArg)) ifNotNil: + [:clonedArray| + self mem: clonedArray + self baseHeaderSize + cp: arrayArg + self baseHeaderSize + y: (self numSlotsOf: arrayArg) * self bytesPerOop. + (self isRemembered: arrayArg) ifTrue: + [scavenger remember: clonedArray]. + forwardIfCloned ifTrue: + [self forward: arrayArg to: clonedArray]. + clonedArray]! Item was added: + ----- Method: SpurMemoryManager>>enterClassesIntoClassTableFrom:to: (in category 'image segment in/out') ----- + enterClassesIntoClassTableFrom: segmentStart to: segmentLimit + "Scan for classes contained in the segment, entering them into the class table, + and clearing their isRemembered: bit. Classes are at the front, after the root + array and have the remembered bit set. If the attempt succeeds, answer 0, + otherwise remove all entered entries and answer an error code." + | objOop errorCode| + objOop := self objectAfter: (self objectStartingAt: segmentStart). + [objOop < segmentLimit + and: [self isRemembered: objOop]] whileTrue: + [self setIsRememberedOf: objOop to: false. + (errorCode := self enterIntoClassTable: objOop) ~= 0 ifTrue: + [| oop | + oop := objOop. + objOop := self objectAfter: (self objectStartingAt: segmentStart). + [objOop < oop] whileTrue: + [self expungeFromClassTable: objOop. + objOop := self objectAfter: objOop limit: segmentLimit]. + ^errorCode]. + objOop := self objectAfter: objOop limit: segmentLimit]. + ^0! Item was changed: ----- Method: SpurMemoryManager>>loadImageSegmentFrom:outPointers: (in category 'image segment in/out') ----- + loadImageSegmentFrom: segmentWordArray outPointers: outPointerArray - loadImageSegmentFrom: segmentWordArrayArg outPointers: outPointerArray "This primitive is called from Squeak as... <imageSegment> loadSegmentFrom: aWordArray outPointers: anArray." "This primitive will load a binary image segment created by primitiveStoreImageSegment. It expects the outPointer array to be of the proper size, and the wordArray to be well formed. It will return as its value the original array of roots, and the erstwhile segmentWordArray will have been truncated to a size of zero. If this primitive should fail, the segmentWordArray will, sadly, have been reduced to an unrecognizable and unusable jumble. But what more could you have done with it anyway?" + <inline: false> + | segmentLimit segmentStart segVersion errorCode | "First thing is to verify format. If Spur is ever ported to big-endian machines then the segment may have to be byte/word swapped, but so far it only runs on little-endian machines, so for now just fail if endinanness is wrong." + segVersion := self longAt: segmentWordArray + self baseHeaderSize. - <inline: false> - | segmentWordArray firstNeedingPostProcessing numOutPointers objOop segLimit segStart segVersion topHashBit topOopBit | - segVersion := self longAt: segmentWordArrayArg + self baseHeaderSize. (coInterpreter readableFormat: (segVersion bitAnd: 16rFFFF "low 2 bytes")) ifFalse: + [self reverseBytesFrom: segmentWordArray + self baseHeaderSize + to: (self addressAfter: segmentWordArray). + segVersion := self longAt: segmentWordArray + self baseHeaderSize. + (coInterpreter readableFormat: (segVersion bitAnd: 16rFFFF "low 2 bytes")) ifFalse: + [self reverseBytesFrom: segmentWordArray + self baseHeaderSize + to: (self addressAfter: segmentWordArray). + ^PrimErrBadArgument]]. - [^PrimErrBadArgument]. + segmentStart := segmentWordArray + self baseHeaderSize + self allocationUnit. + segmentLimit := (self numSlotsOf: segmentWordArray) * self bytesPerOop + segmentWordArray + self baseHeaderSize. - "If segmentWordArrayArg is too short to be truncated, clone it so that the clone is long enough." - (self hasOverflowHeader: segmentWordArrayArg) - ifTrue: - [segmentWordArray := segmentWordArrayArg] - ifFalse: - [segmentWordArray := self allocateSlots: self numSlotsMask + 1 - format: (self formatOf: segmentWordArrayArg) - classIndex: (self classIndexOf: segmentWordArrayArg). - segmentWordArray ifNil: [^PrimErrNoMemory]. - self mem: segmentWordArray + self baseHeaderSize - cp: segmentWordArrayArg + self baseHeaderSize - y: (self numSlotsOf: segmentWordArrayArg) * self bytesPerOop]. + "Notionally reverse the Byte type objects if the data is from opposite endian machine. + Test top byte. $d on the Mac or $s on the PC. Rest of word is equal. If Spur is ever + ported to big-endian machines then the segment may have to be byte/word swapped, + but so far it only runs on little-endian machines, so for now just fail if endinanness is wrong." + self flag: #endianness. + (segVersion >> 16) ~= (self imageSegmentVersion >> 16) ifTrue: + "Reverse the byte-type objects once" + [true + ifTrue: [^PrimErrBadArgument] + ifFalse: + [self byteSwapByteObjectsFrom: (self objectStartingAt: segmentStart) + to: segmentLimit + flipFloatsIf: false]]. - segStart := segmentWordArray + self baseHeaderSize + self allocationUnit. - segLimit := (self numSlotsOf: segmentWordArrayArg) * self bytesPerOop + segmentWordArray + self baseHeaderSize. + "scan through mapping oops and validating class references. Defer entering any + class objects into the class table and/or pinning objects until a second pass." + errorCode := self mapOopsAndValidateClassRefsFrom: segmentStart to: segmentLimit outPointers: outPointerArray. + errorCode ~= 0 ifTrue: + [^errorCode]. - "scan through mapping oops and validating class references. - Defer entering any class objects into the class table and/or - pinning objects until a second pass." - numOutPointers := self numSlotsOf: outPointerArray. - firstNeedingPostProcessing := 0. - topHashBit := 1 bitShift: self identityHashFieldWidth - 1. - topOopBit := 1 bitShift: self bytesPerOop * 8 - 1. - objOop := self objectStartingAt: segStart. - [objOop < segLimit] whileTrue: - [| classIndex hash oop outPointer | - ((self isRemembered: objOop) or: [self isMarked: objOop]) ifTrue: - [^PrimErrInappropriate]. - (firstNeedingPostProcessing = 0 - and: [(self isInNewSpace: objOop) - and: [self isPinned: objOop]]) ifTrue: - [firstNeedingPostProcessing := objOop]. - classIndex := self classIndexOf: objOop. - (classIndex anyMask: topHashBit) - ifTrue: - [classIndex - topHashBit >= numOutPointers ifTrue: - [^PrimErrBadIndex]. - outPointer := self fetchPointer: classIndex - topHashBit ofObject: outPointerArray. - hash := self rawHashBitsOf: outPointer. - (hash > self lastClassIndexPun and: [(self classOrNilAtIndex: hash) = outPointer]) ifFalse: - [^PrimErrInappropriate]. - self setClassIndexOf: objOop to: hash] - ifFalse: "The class is contained within the segment." - [(oop := classIndex * self allocationUnit + segStart) >= segLimit ifTrue: - [^PrimErrBadIndex]. - (self rawHashBitsOf: oop) ~= 0 ifTrue: - [^PrimErrInappropriate]. - self setIsRememberedOf: objOop to: true. - "Don't populate the classTable until all oops have been mapped." - firstNeedingPostProcessing = 0 ifTrue: - [firstNeedingPostProcessing := objOop]]. - 0 to: (self numPointerSlotsOf: objOop) - 1 do: - [:i| - oop := self fetchPointer: i ofObject: objOop. - (self isNonImmediate: oop) ifTrue: - [(oop bitAnd: self allocationUnit - 1) ~= 0 ifTrue: - [^PrimErrInappropriate]. - (oop anyMask: topOopBit) - ifTrue: - [oop / self bytesPerOop >= numOutPointers ifTrue: - [^PrimErrBadIndex]. - outPointer := self fetchPointer: oop / self bytesPerOop ofObject: outPointerArray. - self storePointerUnchecked: i ofObject: objOop withValue: outPointer] - ifFalse: - [oop + segStart >= segLimit ifTrue: - [^PrimErrBadIndex]. - self storePointerUnchecked: i ofObject: objOop withValue: oop + segStart]]]. - objOop := self objectAfter: objOop limit: segLimit]. + "Scan for classes contained in the segment, entering them into the class table. + Classes are at the front, after the root array and have the remembered bit set." + errorCode := self enterClassesIntoClassTableFrom: segmentStart to: segmentLimit. + errorCode ~= 0 ifTrue: + [^errorCode]. - "Scan for classes contained in the segment, entering them into - the class table, and assigning the class indices of their instances." - firstNeedingPostProcessing ~= 0 ifTrue: - [objOop := firstNeedingPostProcessing. - self assert: (self isRemembered: objOop). - [objOop < segLimit] whileTrue: - [(self isRemembered: objOop) ifTrue: - [| classIndex hash oop errorCode | - self setIsRememberedOf: objOop to: false. - classIndex := self classIndexOf: objOop. - self deny: (classIndex anyMask: topHashBit). "The class is contained within the segment." - oop := classIndex * self allocationUnit + segStart. - (hash := self rawHashBitsOf: oop) = 0 ifTrue: "The class needs to be added to the classTable" - [(errorCode := self enterIntoClassTable: oop) ~= 0 ifTrue: - [objOop := self objectStartingAt: segStart. - [objOop < segLimit] whileTrue: - [hash := self rawHashBitsOf: objOop. - hash > self lastClassIndexPun and: [(self classOrNilAtIndex: hash) = objOop ifTrue: - [self expungeFromClassTable: objOop]. - objOop := self objectAfter: objOop limit: segLimit]]. - ^errorCode]. - hash := self rawHashBitsOf: oop]. - self setClassIndexOf: objOop to: hash]. - ((self isInNewSpace: objOop) - and: [self isPinned: objOop]) ifTrue: - [| oldClone | - oldClone := self cloneInOldSpaceForPinning: objOop. - oldClone ~= 0 ifTrue: - [self setIsPinnedOf: oldClone to: true. - self forward: objOop to: oldClone]]. - objOop := self objectAfter: objOop limit: segLimit]]. + "Make a final pass, assigning class indices and/or pinning pinned objects" + self assignClassIndicesAndPinFrom: segmentStart to: segmentLimit outPointers: outPointerArray. + "Finally evaporate the container, leaving the newly loaded objects in place." + (self hasOverflowHeader: segmentWordArray) + ifTrue: [self setOverflowNumSlotsOf: segmentWordArray to: 0] + ifFalse: [self setRawNumSlotsOf: segmentWordArray to: 0]. - self setOverflowNumSlotsOf: segmentWordArray to: 0. self leakCheckImageSegments ifTrue: [self runLeakCheckerForFullGC: true]. + ^self objectStartingAt: segmentStart! - ^self objectStartingAt: segStart! Item was added: + ----- Method: SpurMemoryManager>>mapOopsAndValidateClassRefsFrom:to:outPointers: (in category 'image segment in/out') ----- + mapOopsAndValidateClassRefsFrom: segmentStart to: segmentLimit outPointers: outPointerArray + "scan through mapping oops and validating class references. + Defer entering any class objects into the class table and/or + pinning objects until a second pass." + | numOutPointers objOop topHashBit topOopBit | + numOutPointers := self numSlotsOf: outPointerArray. + topHashBit := 1 bitShift: self identityHashFieldWidth - 1. + topOopBit := 1 bitShift: self bytesPerOop * 8 - 1. + objOop := self objectStartingAt: segmentStart. + [objOop < segmentLimit] whileTrue: + [| classIndex hash oop mappedOop | + (self isMarked: objOop) ifTrue: + [^PrimErrInappropriate]. + classIndex := self classIndexOf: objOop. + "validate the class ref, but don't update it until any internal classes have been added to the class table." + (classIndex anyMask: topHashBit) + ifTrue: + [classIndex - topHashBit >= numOutPointers ifTrue: + [^PrimErrBadIndex]. + mappedOop := self fetchPointer: classIndex - topHashBit ofObject: outPointerArray. + hash := self rawHashBitsOf: mappedOop. + (hash > self lastClassIndexPun and: [(self classOrNilAtIndex: hash) = mappedOop]) ifFalse: + [^PrimErrInappropriate]] + ifFalse: "The class is contained within the segment." + [(oop := classIndex * self allocationUnit + segmentStart) >= segmentLimit ifTrue: + [^PrimErrBadIndex]. + (self rawHashBitsOf: oop) ~= 0 ifTrue: + [^PrimErrInappropriate]]. + 0 to: (self numPointerSlotsOf: objOop) - 1 do: + [:i| + oop := self fetchPointer: i ofObject: objOop. + (self isNonImmediate: oop) ifTrue: + [(oop anyMask: topOopBit) + ifTrue: + [(oop := oop - topOopBit / self bytesPerOop) >= numOutPointers ifTrue: + [^PrimErrBadIndex]. + mappedOop := self fetchPointer: oop ofObject: outPointerArray] + ifFalse: + [(oop bitAnd: self allocationUnit - 1) ~= 0 ifTrue: + [^PrimErrInappropriate]. + (mappedOop := oop + segmentStart) >= segmentLimit ifTrue: + [^PrimErrBadIndex]]. + self storePointerUnchecked: i ofObject: objOop withValue: mappedOop]]. + objOop := self objectAfter: objOop limit: segmentLimit]. + ^0! Item was added: + ----- Method: SpurMemoryManager>>mapOopsFrom:to:outPointers:outHashes: (in category 'image segment in/out') ----- + mapOopsFrom: segStart to: segAddr outPointers: outPointerArray outHashes: savedOutHashes + "Now scan, adding out pointers to the outPointersArray; all objects in arrayOfObjects + have their hashes set to point to their copies in segmentWordArray. Answer the outIndex + if the scan succeded, otherwise answer -1. It will fail if outPointers is too small." + | objOop outIndex topHashBit topOopBit | + outIndex := 0. + self fillObj: outPointerArray numSlots: (self numSlotsOf: outPointerArray) with: nilObj. + topHashBit := 1 bitShift: self identityHashFieldWidth - 1. + topOopBit := 1 bitShift: self bytesPerOop * 8 - 1. + objOop := self objectStartingAt: segStart. + [objOop < segAddr] whileTrue: + [| oop hash | + oop := self fetchClassOfNonImm: objOop. + (self isMarked: oop) ifFalse: "oop is a new outPointer; allocate its oop" + [outIndex := self newOutPointer: oop at: outIndex in: outPointerArray hashes: savedOutHashes topHashBit: topHashBit. + outIndex = 0 ifTrue:"no room in outPointers; fail" + [^-1]]. + hash := self rawHashBitsOf: oop. + self setClassIndexOf: objOop to: hash. + 0 to: (self numPointerSlotsOf: objOop) - 1 do: + [:i| + oop := self fetchPointer: i ofObject: objOop. + (self isNonImmediate: oop) ifTrue: + [(self isMarked: oop) ifFalse: "oop is a new outPointer; allocate its oop" + [outIndex := self newOutPointer: oop at: outIndex in: outPointerArray hashes: savedOutHashes topHashBit: topHashBit. + outIndex = 0 ifTrue: "no room in outPointers; fail" + [^-1]]. + oop := self mappedOopOf: oop topHashBit: topHashBit topOopBit: topOopBit.. + self storePointerUnchecked: i ofObject: objOop withValue: oop]]. + objOop := self objectAfter: objOop limit: segAddr]. + ^outIndex! Item was added: + ----- Method: SpurMemoryManager>>moveClassesForwardsIn: (in category 'image segment in/out') ----- + moveClassesForwardsIn: arrayOfObjects + "Both to expand the max size of segment and to reduce the length of the + load-time pass that adds classes to the class table, move classes to the + front of arrayOfObjects, leaving the root array as the first element." + | there | + there := 0. "if > 0, this is the index of the first non-class past the first element." + 1 to: (self numSlotsOf: arrayOfObjects) - 1 do: + [:here| | objOop hash tempObjOop | + objOop := self fetchPointer: here ofObject: arrayOfObjects. + hash := self rawHashBitsOf: objOop. + (hash > self lastClassIndexPun and: [(self classOrNilAtIndex: hash) = objOop]) + ifTrue: + [there > 0 ifTrue: "if there is zero we're in a run of classes at the start so don't move" + [tempObjOop := self fetchPointer: there ofObject: arrayOfObjects. + self storePointerUnchecked: there ofObject: arrayOfObjects withValue: objOop. + self storePointerUnchecked: here ofObject: arrayOfObjects withValue: tempObjOop. + there := there + 1]] + ifFalse: + [there = 0 ifTrue: + [there := here]]]! Item was changed: ----- Method: SpurMemoryManager>>newOutPointer:at:in:hashes:topHashBit: (in category 'image segment in/out') ----- newOutPointer: oop at: outIndex in: outPointerArray hashes: savedOutHashes topHashBit: topHashBit "oop is a new outPointer; allocate its oop, and answer the new outIndex. If outPointerArray is full, answer 0." <inline: true> + outIndex >= (self numSlotsOf: outPointerArray) ifTrue: + ["no room in outPointers; fail" + ^0]. - outIndex >= (self rawOverflowSlotsOf: outPointerArray) ifTrue: - ["no room in outPointers; fail" - ^0]. self storePointer: outIndex ofObject: outPointerArray withValue: oop. self storeLong32: outIndex ofObject: savedOutHashes withValue: (self rawHashBitsOf: oop). self setHashBitsOf: oop to: outIndex + topHashBit. self setIsMarkedOf: oop to: true. ^outIndex + 1! Item was changed: ----- Method: SpurMemoryManager>>objectsReachableFromRoots: (in category 'image segment in/out') ----- objectsReachableFromRoots: arrayOfRoots "Answer an Array of all the objects only reachable from the argument, an Array of root objects, starting with arrayOfRoots. If there is no space, answer a SmallInteger whose value is the number of slots required. This is used to collect the objects to include in an image segment on Spur, separate from creating the segment, hence simplifying the implementation. Thanks to Igor Stasenko for this idea." | freeChunk ptr start limit count oop objOop | self assert: (self isArray: arrayOfRoots). "Mark all objects except those only reachable from the arrayOfRoots by marking each object in arrayOfRoots and then marking all reachable objects (from the system roots). This leaves unmarked only objects reachable from the arrayOfRoots. N.B. A side-effect of the marking is that all forwarders in arrayOfRoots will be followed." self assert: self allObjectsUnmarked. + self markObjectsIn: arrayOfRoots. - self setIsMarkedOf: arrayOfRoots to: true. self markObjects: false. "After the mark phase all unreachable weak slots will have been nilled and all active ephemerons fired." self assert: (self isEmptyObjStack: markStack). self assert: (self isEmptyObjStack: weaklingStack). self assert: self noUnscannedEphemerons. "Use the largest free chunk to answer the result." freeChunk := self allocateLargestFreeChunk. ptr := start := freeChunk + self baseHeaderSize. limit := self addressAfter: freeChunk. count := 0. "First put the roots; order is important." self push: arrayOfRoots onObjStack: markStack. + 0 to: (self numSlotsOf: arrayOfRoots) - 1 do: + [:i| + oop := self fetchPointer: i ofObject: arrayOfRoots. + (self isNonImmediate: oop) ifTrue: + [self push: oop onObjStack: markStack]]. "Now collect the unmarked objects reachable from the roots." [self isEmptyObjStack: markStack] whileFalse: [objOop := self popObjStack: markStack. count := count + 1. ptr < limit ifTrue: [self longAt: ptr put: objOop. ptr := ptr + self bytesPerSlot]. oop := self fetchClassOfNonImm: objOop. (self isMarked: oop) ifFalse: [self setIsMarkedOf: objOop to: true. self push: oop onObjStack: markStack]. 0 to: (self numPointerSlotsOf: objOop) - 1 do: [:i| oop := self fetchPointer: i ofObject: objOop. ((self isImmediate: oop) or: [self isMarked: oop]) ifFalse: [self setIsMarkedOf: objOop to: true. self push: oop onObjStack: markStack]]]. self unmarkAllObjects. totalFreeOldSpace := totalFreeOldSpace - (self bytesInObject: freeChunk). "Now try and allocate the result" (count > (ptr - start / self bytesPerSlot) "not enough room" or: [limit ~= ptr and: [limit - ptr <= self allocationUnit]]) ifTrue: "can't split a single word" [self freeChunkWithBytes: (self bytesInObject: freeChunk) at: (self startOfObject: freeChunk). self checkFreeSpace. ^self integerObjectOf: count]. "There's room; set the format, & classIndex and shorten." self setFormatOf: freeChunk to: self arrayFormat. self setClassIndexOf: freeChunk to: ClassArrayCompactIndex. self shorten: freeChunk toIndexableSize: count. self possibleRootStoreInto: freeChunk. self checkFreeSpace. self runLeakCheckerForFullGC: false. ^freeChunk! Item was changed: ----- Method: SpurMemoryManager>>shorten:toIndexableSize: (in category 'allocation') ----- shorten: objOop toIndexableSize: indexableSize "Reduce the number of indexable fields in objOop, a pointer object, to nSlots. Convert the unused residual to a free chunk. Without changes to numSlotsForShortening:toIndexableSize: this only works for arrayFormat and longFormat objects. Answer the number of bytes returned to free memory, which may be zero if no change was possible." <inline: false> | numSlots bytesBefore delta freeChunk | numSlots := self numSlotsForShortening: objOop toIndexableSize: indexableSize. numSlots = (self numSlotsOf: objOop) ifTrue: [^0]. bytesBefore := self bytesInObject: objOop. (self hasOverflowHeader: objOop) ifTrue: [self rawOverflowSlotsOf: objOop put: numSlots] ifFalse: [self assert: numSlots < self numSlotsMask. self rawNumSlotsOf: objOop put: numSlots]. delta := bytesBefore - (self bytesInObject: objOop). + "We have options. + 1. we can clone the object and forward to the clone. + 2. if the following object has a short header we can given it a large header." + self flag: 'deal with it, dude'. + delta <= self allocationUnit ifTrue: + [self error: 'shorten:toIndexableSize: attempted to shorten to allocationUnit!!']. freeChunk := self initFreeChunkWithBytes: delta at: (self addressAfter: objOop). (self isInOldSpace: objOop) ifTrue: [totalFreeOldSpace := totalFreeOldSpace + delta. self addToFreeList: freeChunk bytes: delta] ifFalse: [self setClassIndexOf: freeChunk to: self wordSizeClassIndexPun; setFormatOf: freeChunk to: self firstLongFormat]. ^delta! Item was changed: ----- Method: SpurMemoryManager>>storeImageSegmentInto:outPointers:roots: (in category 'image segment in/out') ----- storeImageSegmentInto: segmentWordArray outPointers: outPointerArray roots: arrayOfRoots "This primitive is called from Squeak as... <imageSegment> storeSegmentFor: arrayOfRoots into: aWordArray outPointers: anArray. This primitive will store a binary image segment (in the same format as objercts in the heap) of the set of objects in arrayOfObjects. All pointers from within the set to objects outside the set will be copied into the array of outPointers. In their place in the image segment will be an oop equal to the offset in the outPointer array (the first would be 4). but with the high bit set. + Since Spur has a class table the load primitive must insert classes that have instances in the class + table. This primitive marks such classes using the isRemembered bit, which isn't meaningful as a + remembered bit in the segment. + The primitive expects the segmentWordArray and outPointerArray to be more than adequately long. + In this case it returns normally, and truncates the two arrays to exactly the right size. - In this case it returns normally, and truncates the two arrays to exactly the right size. To simplify - truncation, both incoming arrays are required to be whatever the objectMemory considers long - objects. If either array is too small, the primitive will fail. The primitive can fail for the following reasons with the specified failure codes: PrimErrWritePastObject: the segmentWordArray is too small PrimErrBadIndex: the outPointerArray is too small PrimErrNoMemory: additional allocations failed PrimErrLimitExceeded: there is no room in the hash field to store object oops." <inline: false> + | arrayOfObjects savedInHashes savedOutHashes fillValue segStart segAddr endSeg outIndex | - | arrayOfObjects savedInHashes savedOutHashes fillValue endSeg segAddr topHashBit objOop outIndex segStart topOopBit | - (self hasOverflowHeader: segmentWordArray) ifFalse: "Must have 128-bit header" - [^PrimErrWritePastObject]. - (self hasOverflowHeader: outPointerArray) ifFalse: "Must have 128-bit header" - [^PrimErrBadIndex]. - self leakCheckImageSegments ifTrue: [self runLeakCheckerForFullGC: true]. "First compute the transitive closure, collecting the sequence of objects to be stored in the arrayOfObjects array." arrayOfObjects := self objectsReachableFromRoots: arrayOfRoots. arrayOfObjects ifNil: [^PrimErrNoMemory]. + self assert: self allObjectsUnmarked. "work to be done when the incremental GC is written" + - "The scheme is to copy the objects into segmentWordArray, and then map the oops in sementWordArray. Therefore the primitive needs to both map efficiently originals to copies in segmentWordArray and be able to undo any side-effects if the primitive fails because either sementWordArray or outPointerArray is too small. The mapping is done by having the originals (either the objects in arrayOfObjects or the objects in outPointerArray) refer to their mapped locations through their identityHash, and saving their identityHashes in two ByteArrays, one that mirrors arrayOfObjects, and one that mirrors outPointerArray. Since arrayOfObjects and its saved hashes, and outPointerArray and its saved hashes, can be enumerated side-by-side, the hashes can be restored to the originals. So the hash of an object in arrayOfObjects is set to its offset in segmentWordArray / self allocationUnit, and the hash of an object in outPointerArray is set to its index in outPointerArray plus the top hash bit. Oops in segmentWordArray are therefore mapped by accessing the original oop's identityHash, testing the bottom bit to distinguish between internal and external oops. The saved hash arrays are initialized with an out-of-range hash value so that the first unused entry can be identified." savedInHashes := self allocateSlots: (self numSlotsForBytes: (self numSlotsOf: arrayOfObjects) * 4) format: self firstLongFormat classIndex: self thirtyTwoBitLongsClassIndexPun. savedOutHashes := self allocateSlots: (self numSlotsForBytes: (self numSlotsOf: outPointerArray) * 4) format: self firstLongFormat classIndex: self thirtyTwoBitLongsClassIndexPun. (savedInHashes isNil or: [savedOutHashes isNil]) ifTrue: + [self freeObject: arrayOfObjects. + ^PrimErrNoMemory]. + - [^PrimErrNoMemory]. fillValue := self wordSize = 4 ifTrue: [self maxIdentityHash + 1] ifFalse: [self maxIdentityHash + 1 << 32 + (self maxIdentityHash + 1)]. self fillObj: savedInHashes numSlots: (self numSlotsOf: savedInHashes) with: fillValue. self fillObj: savedOutHashes numSlots: (self numSlotsOf: savedOutHashes) with: fillValue. + "Both to expand the max size of segment and to reduce the length of the + load-time pass that adds classes to the class table, move classes to the + front of arrayOfObjects, leaving the root array as the first element." + self moveClassesForwardsIn: arrayOfObjects. + segAddr := segmentWordArray + self baseHeaderSize. endSeg := self addressAfter: segmentWordArray. "Write a version number for byte order and version check." segAddr >= endSeg ifTrue: [^PrimErrGenericFailure]. self long32At: segAddr put: self imageSegmentVersion. self long32At: segAddr + 4 put: self imageSegmentVersion. segStart := segAddr := segAddr + self allocationUnit. + "Copy all reachable objects to the segment." - self assert: self allObjectsUnmarked. "work to be done when the incremental GC is written" - 0 to: (self numSlotsOf: arrayOfObjects) - 1 do: + [:i| | newSegAddrOrError objOop | - [:i| | newSegAddrOrError | objOop := self fetchPointer: i ofObject: arrayOfObjects. self deny: ((self isImmediate: objOop) or: [self isForwarded: objOop]). self storeLong32: i ofObject: savedInHashes withValue: (self rawHashBitsOf: objOop). newSegAddrOrError := self copyObj: objOop toAddr: segAddr startAt: segStart stopAt: endSeg. newSegAddrOrError < segStart ifTrue: [^self return: newSegAddrOrError restoringObjectsIn: arrayOfObjects savedHashes: savedInHashes and: outPointerArray savedHashes: savedOutHashes]. segAddr := newSegAddrOrError]. + "Check that it can be safely shortened." (endSeg ~= segAddr and: [endSeg - segAddr < (self baseHeaderSize + self bytesPerSlot)]) ifTrue: [^self return: PrimErrWritePastObject restoringObjectsIn: arrayOfObjects savedHashes: savedInHashes and: outPointerArray savedHashes: savedOutHashes]. "Now scan, adding out pointers to the outPointersArray; all objects in arrayOfObjects have their hashes set to point to their copies in segmentWordArray." + (outIndex := self mapOopsFrom: segStart + to: segAddr + outPointers: outPointerArray + outHashes: savedOutHashes) < 0 ifTrue: "no room in outPointers; fail" + [^self return: PrimErrBadIndex + restoringObjectsIn: arrayOfObjects savedHashes: savedInHashes + and: outPointerArray savedHashes: savedOutHashes]. - outIndex := 0. - self fillObj: outPointerArray numSlots: (self numSlotsOf: outPointerArray) with: nilObj. - topHashBit := 1 bitShift: self identityHashFieldWidth - 1. - topOopBit := 1 bitShift: self bytesPerOop * 8 - 1. - objOop := self objectStartingAt: segStart. - [objOop < segAddr] whileTrue: - [| oop hash | - oop := self fetchClassOfNonImm: objOop. - (self isMarked: oop) ifFalse: "oop is a new outPointer; allocate its oop" - [outIndex := self newOutPointer: oop at: outIndex in: outPointerArray hashes: savedOutHashes topHashBit: topHashBit. - outIndex = 0 ifTrue:"no room in outPointers; fail" - [^self return: PrimErrBadIndex - restoringObjectsIn: arrayOfObjects savedHashes: savedInHashes - and: outPointerArray savedHashes: savedOutHashes]]. - hash := self rawHashBitsOf: oop. - self setClassIndexOf: objOop to: hash. - 0 to: (self numPointerSlotsOf: objOop) - 1 do: - [:i| - oop := self fetchPointer: i ofObject: objOop. - (self isNonImmediate: oop) ifTrue: - [(self isMarked: oop) ifFalse: "oop is a new outPointer; allocate its oop" - [outIndex := self newOutPointer: oop at: outIndex in: outPointerArray hashes: savedOutHashes topHashBit: topHashBit. - outIndex = 0 ifTrue: "no room in outPointers; fail" - [^self return: PrimErrBadIndex - restoringObjectsIn: arrayOfObjects savedHashes: savedInHashes - and: outPointerArray savedHashes: savedOutHashes]]. - oop := self mappedOopOf: oop topHashBit: topHashBit topOopBit: topOopBit.. - self storePointerUnchecked: i ofObject: objOop withValue: oop]]. - objOop := self objectAfter: objOop limit: segAddr]. + "We're done. SHorten the results, restore hashes and return." self shorten: segmentWordArray toIndexableSize: segAddr - (segmentWordArray + self baseHeaderSize) / 4. self shorten: outPointerArray toIndexableSize: outIndex. ^self return: PrimNoErr restoringObjectsIn: arrayOfObjects savedHashes: savedInHashes and: outPointerArray savedHashes: savedOutHashes! Item was changed: ----- Method: StackInterpreter>>longPrintOop: (in category 'debug printing') ----- longPrintOop: oop <api> | fmt lastIndex startIP bytecodesPerLine column | ((objectMemory isImmediate: oop) or: [(objectMemory addressCouldBeObj: oop) not or: [(oop bitAnd: objectMemory allocationUnit - 1) ~= 0 or: [(objectMemory isFreeObject: oop) or: [objectMemory isForwarded: oop]]]]) ifTrue: [self printOop: oop. ^self]. self printHex: oop. (objectMemory fetchClassOfNonImm: oop) ifNil: [self print: ' has a nil class!!!!'] ifNotNil: [:class| self print: ': a(n) '; printNameOfClass: class count: 5; print: ' ('. objectMemory hasSpurMemoryManagerAPI ifTrue: [self printHexnp: (objectMemory compactClassIndexOf: oop); print: '=>']. self printHexnp: class; print: ')']. fmt := objectMemory formatOf: oop. self print: ' format '; printHexnp: fmt. fmt > objectMemory lastPointerFormat ifTrue: [self print: ' nbytes '; printNum: (objectMemory numBytesOf: oop)] ifFalse: [(objectMemory isIndexableFormat: fmt) ifTrue: [| len | len := objectMemory lengthOf: oop. self print: ' size '; printNum: len - (objectMemory fixedFieldsOf: oop format: fmt length: len)]]. objectMemory printHeaderTypeOf: oop. self print: ' hash '; printHexnp: (objectMemory rawHashBitsOf: oop). self cr. (fmt between: objectMemory firstByteFormat and: objectMemory firstCompiledMethodFormat - 1) ifTrue: [^self printStringOf: oop; cr]. (fmt between: objectMemory firstLongFormat and: objectMemory firstByteFormat - 1) ifTrue: + [0 to: ((objectMemory num32BitUnitsOf: oop) min: 256) - 1 do: + [:i| | fieldOop | + fieldOop := objectMemory fetchLong32: i ofObject: oop. + self space; printNum: i - 1; space; printHex: fieldOop; space; cr]. + ^self]. - [^self]. "this is nonsense. apologies." startIP := (objectMemory lastPointerOf: oop) + BytesPerOop - objectMemory baseHeaderSize / BytesPerOop. lastIndex := 256 min: startIP. lastIndex > 0 ifTrue: [1 to: lastIndex do: [:i| | fieldOop | fieldOop := objectMemory fetchPointer: i - 1 ofObject: oop. self space; printNum: i - 1; space; printHex: fieldOop; space. (i = 1 and: [objectMemory isCompiledMethod: oop]) ifTrue: [self printMethodHeaderOop: fieldOop] ifFalse: [self cCode: [self printOopShort: fieldOop] inSmalltalk: [self print: (self shortPrint: fieldOop)]]. self cr]]. (objectMemory isCompiledMethod: oop) ifFalse: [startIP > 64 ifTrue: [self print: '...'; cr]] ifTrue: [startIP := startIP * BytesPerWord + 1. lastIndex := objectMemory lengthOf: oop. lastIndex - startIP > 100 ifTrue: [lastIndex := startIP + 100]. bytecodesPerLine := 8. column := 1. startIP to: lastIndex do: [:index| | byte | column = 1 ifTrue: [self cCode: 'printf("0x%08x: ", oop+BaseHeaderSize+index-1)' inSmalltalk: [self print: (oop+BaseHeaderSize+index-1) hex; print: ': ']]. byte := objectMemory fetchByte: index - 1 ofObject: oop. self cCode: 'printf(" %02x/%-3d", byte,byte)' inSmalltalk: [self space; print: (byte radix: 16); printChar: $/; printNum: byte]. column := column + 1. column > bytecodesPerLine ifTrue: [column := 1. self cr]]. column = 1 ifFalse: [self cr]]!

1 0

Re: [squeak-dev] re: Image Segment semantics and weakness
by Bert Freudenberg 22 Oct '14

22 Oct '14

On 22.10.2014, at 08:47, Craig Latta <craig(a)netjam.org> wrote: > >> So it seems we agree that the key and good part of ImageSegment is >> that one, swapping out, but not as a general object graph serializer. > > Even for swapping out objects, I think putting them in their own > normal object memory is a better idea, since object memories can be > minimal and small. This lets you perform more sophisticated reasoning > about what to do when class formats change between swap-out and swap-in > (as well as other meta-operations). That's a different thing. Swapping is strictly about cutting up a single image into multiple segments. Proper mutation code would have to walk the whole object memory, meaning it needs to swap in all segments in turn. Which fortunately is extremely efficient, but likely still hairy enough that we're not actually using it given today's abundance of main memory. It might, however, still make a lot of sense e.g. as a deployment mechanism on mobile platforms, which still are severely memory-limited. If used strictly for deployment you don't have to worry about mutation. - Bert -

1 0

Re: [squeak-dev] Image Segment semantics and weakness
by Mariano Martinez Peck 22 Oct '14

22 Oct '14

Just a quick note I would like to share.... For my PhD, I did investigate ImageSegment very very deeply: http://dl.acm.org/citation.cfm?id=2076323 http://www.slideshare.net/MarianoMartinezPeck/2010-smalltalkspeckobject-swa… I didn't want to write Fuel just because. I took quite a lot of time to understand how ImageSegment primitives worked. From that effort, I remember a few conclusions: 1) I found only few users of ImageSegment 2) The few users I found, were NOT using the real purpose of ImageSegment, that is, object swapping. It was used instead as an object serializer. For that, they use #writeForExportOn: which ended up using SmartRefStream for the rest of the objects. 3) I noticed I could achieve the same performance or even better with an OO serializer built at the language side, with all the benefits this means. Of course, having Cog helped here.... In the Fuel paper: http://rmod.lille.inria.fr/archives/papers/Dias12a-SPE-Fuel.pdf you can find some benchmark comparison agains IS. Also in my PhD: http://rmod.lille.inria.fr/archives/phd/PhD-2012-Martinez-Peck.pdf Cheers, On Mon, Oct 20, 2014 at 9:56 PM, <jvuletich(a)dc.uba.ar> wrote: > Hi Eliot, > > > Hi All, > > > > I want to check my understanding of reference semantics for image > > segments as I'm close to completing the Spur implementation. > Specifically > > the question is whether objects reachable only through weak pointers > > should > > be included in an image segment or not. > > > > Remember that an image segment is created from the transitive closure of > > an > > Array of root objects, the *segment roots*. i.e. we can think of an image > > segment as a set of objects created by tracing the object graph from the > > segment roots. > > > > The segment always includes the segment roots. Except for the roots, > > objects are excluded from the segment that are also reachable form the > > roots of the system (the *system roots*, effectively the root > environment, > > Smalltalk, and the stack of the current process). > > > > Consider a weak array in the transitive closure that is not reachable > from > > the system roots, and hence should be included in the segment. Objects > > referenced from that weak array may be in one of three categories > > > > - reachable from the system roots (and hence not to be included in the > > segment) > > - *not* reachable form the system roots, but reachable from the segment > > roots via strong pointers (and hence to be included in the segment) > > - *not* reachable form the system roots, *not* reachable from the segment > > roots via strong pointers > > > > Should this last category be included or excluded from the segment? I > > think that it makes no difference, and excluding them is only an > > optimization. The argument is as follows. Imagine that immediately > after > > loading the image segment there is a garbage collection. That garbage > > collection will collect all the objects in the last category as they are > > only reachable from the weak arrays in the segment. Hence we are free to > > follow weak references as if they are strong when we create the image > > segment, leaving it to subsequent events to reclaim those objects. > > > > An analogous argument accounts for objects reachable from ephemerons. Is > > my reasoning sound? > > -- > > best, > > Eliot > > > > > > I think you are right. But there is a risk of somehow, someone, gaining a > strong reference to the object after the image segment was created, > breaking our invariants when the segment is loaded again. > > An object might be (not reachable / strongly reachable / weakely > reachable) from system roots and / or segment roots. This gives us 9 > possibilities. > Six of them are easy (and I'll not go into them). The other three are > tricky: > > a- Not reachable from system roots. Weakely reachable from segment roots. > Do not include them. It is best to run a GC before building the image > segment, to get rid of them (run termination, etc). This is to avoid the > risk of the object gaining somehow a strong reference after the segment is > built, making the segment miss the weak ref to it. Doing this way would > also mean that any objects affected by termination would be consistent, > both in the image and in the segment. > > b- Weakely reachable from system roots. Weakely reachable from segment > roots. > Do not include them. If the object manages to survive by gaining a strong > ref from the system roots, the weak ref will be repaired on segment load > (Am I right on this?) If the original object was included in the segment, > then on segment load it would point to a duplicate object that is about to > be collected (and maybe terminated?) In any case, doing this way would also > mean that any objects affected by termination would be consistent, both in > the image and in the segment. > > c- Weakely reachable from system roots. Strongly reachable from segment > roots. > Do include them. It seems reasonable to run a GC and get rid of them after > unloading the segment, to avoid the risk of the object gaining somehow a > strong ref in the image, and being duplicated on segment load. But doing as > I say means that we would be loading into the image an object that was > already terminated, although in the state it had before running > termination. Not really sure if this is ok. There could be some risk of > objects in the segment being in some pre-termination state, with some > objects in the image being in some after-termination state. In any case, > this would suggest bad design... So perhaps it makes sense to throw an > exception in these cases? > > I hope this rant is of use. > > Cheers, > Juan Vuletich > > > > -- Mariano http://marianopeck.wordpress.com

2 2

[commit][3106] CogVM source as per VMMaker.oscog-eem.907
by commits＠squeakvm.org 22 Oct '14

22 Oct '14

Revision: 3106 Author: eliot Date: 2014-10-21 19:17:13 -0700 (Tue, 21 Oct 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.907 Spur: Implement image segments. Use Igor's idea of splitting the computation of the transitive closure from the writing of the image segment for simplicity, even if the two are together into a single primitive for backwards-compatibility. Status is that raw use of the primtiives works, but use in the context of ImageSegmentTest fails apparently because something somewhere changes the version stamp at teh start of a segment. Any clues appreciated. Rename markAccessibleObjects to markAccessibleObjectsAndFireEphemerons, rename markObjects to markObjects: flag, where flag is true if objects are known to be unmarked before hand. Move expungeDuplicateAndUnmarkedClasses: and nilUnmarkedWeaklingSlots into markObjects: from globalGarbageCollect. This is all to ensure that the mark phase of the storeImageSegment prim does process weaklings fully before computing the transitive closure. Extend the object shortening code to include word objects (for the image segment arrays) and make them deal with new space objects as well as old space objects. Have freeObject: attempt to coalesce to avoid fragmenting the largest free chunk all the time it is used for scratch storage). Nuke the abortive attempt to implement the Spur image segment code similarly to the V3 code. Simplify isHiddenObj: for leak checking to tolerate more punned scratch objects in new space. Add a flag to checkForLeaks to specifically check for leaks around the segment prims. Change readableFormat: so that on Spur there is as yet no acceptable compatibility version. All: Rewrite the two primitives to pass back an error code on failure, and rewrite the (New)ObjectMemory code to answer informative failure codes. Make findClassContainingMethod:startingAt: et al robust in the face of faulted-out classes (nil method dictionaries). No longer parenthesize BaseHeaderSize (and soon BytesPerOop and BytesPerWord) for upcoming 64-bit changes. Fix parenthesization bugs in validation code in some Alien plugin primtiives. Include the AioPlugin in the Newspeak linux VMs; recent reports indicate it's essential to good performance in recent versions of OSProcessPlugin. Modified Paths: -------------- branches/Cog/build.linux32x86/newspeak.cog.spur/build/plugins.int branches/Cog/build.linux32x86/newspeak.cog.spur/build.assert/plugins.int branches/Cog/build.linux32x86/newspeak.cog.spur/build.assert.itimerheartbea… branches/Cog/build.linux32x86/newspeak.cog.spur/build.debug/plugins.int branches/Cog/build.linux32x86/newspeak.cog.spur/build.debug.itimerheartbeat… branches/Cog/build.linux32x86/newspeak.cog.spur/build.itimerheartbeat/plugi… branches/Cog/build.linux32x86/newspeak.cog.v3/build/plugins.int branches/Cog/build.linux32x86/newspeak.cog.v3/build.assert/plugins.int branches/Cog/build.linux32x86/newspeak.cog.v3/build.assert.itimerheartbeat/… branches/Cog/build.linux32x86/newspeak.cog.v3/build.debug/plugins.int branches/Cog/build.linux32x86/newspeak.cog.v3/build.debug.itimerheartbeat/p… branches/Cog/build.linux32x86/newspeak.cog.v3/build.itimerheartbeat/plugins… branches/Cog/build.linux32x86/newspeak.sista.spur/build/plugins.int branches/Cog/build.linux32x86/newspeak.sista.spur/build.assert/plugins.int branches/Cog/build.linux32x86/newspeak.sista.spur/build.assert.itimerheartb… branches/Cog/build.linux32x86/newspeak.sista.spur/build.debug/plugins.int branches/Cog/build.linux32x86/newspeak.sista.spur/build.debug.itimerheartbe… branches/Cog/build.linux32x86/newspeak.sista.spur/build.itimerheartbeat/plu… branches/Cog/build.linux32x86/newspeak.sista.v3/build/plugins.int branches/Cog/build.linux32x86/newspeak.sista.v3/build.assert/plugins.int branches/Cog/build.linux32x86/newspeak.sista.v3/build.assert.itimerheartbea… branches/Cog/build.linux32x86/newspeak.sista.v3/build.debug/plugins.int branches/Cog/build.linux32x86/newspeak.sista.v3/build.debug.itimerheartbeat… branches/Cog/build.linux32x86/newspeak.sista.v3/build.itimerheartbeat/plugi… branches/Cog/build.linux32x86/newspeak.stack.spur/build/plugins.int branches/Cog/build.linux32x86/newspeak.stack.spur/build.assert/plugins.int branches/Cog/build.linux32x86/newspeak.stack.spur/build.debug/plugins.int branches/Cog/build.linux32x86/newspeak.stack.v3/build/plugins.int branches/Cog/build.linux32x86/newspeak.stack.v3/build.assert/plugins.int branches/Cog/build.linux32x86/newspeak.stack.v3/build.debug/plugins.int branches/Cog/image/buildspurtrunkimage.sh branches/Cog/image/getGoodCogNsvm.sh branches/Cog/image/getGoodCogVM.sh branches/Cog/image/getGoodSpurNsvm.sh branches/Cog/image/getGoodSpurVM.sh branches/Cog/image/makegetnsvmscripts.sh branches/Cog/image/makegetvmscripts.sh branches/Cog/nscogsrc/plugins/IA32ABI/IA32ABI.c branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/cogit.c branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/scripts/uploadvms branches/Cog/sistasrc/vm/cogit.c branches/Cog/sistasrc/vm/cogit.h branches/Cog/sistasrc/vm/cointerp.c branches/Cog/sistasrc/vm/cointerp.h branches/Cog/sistasrc/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/cogit.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/cogit.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/src/plugins/IA32ABI/IA32ABI.c branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c Added Paths: ----------- branches/Cog/image/resizesqueakwindow.sh branches/Cog/nscogsrc/plugins/AioPlugin/ branches/Cog/nscogsrc/plugins/AioPlugin/AioPlugin.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/build.linux32x86/newspeak.cog.spur/build/plugins.int =================================================================== --- branches/Cog/build.linux32x86/newspeak.cog.spur/build/plugins.int 2014-10-14 19:54:42 UTC (rev 3105) +++ branches/Cog/build.linux32x86/newspeak.cog.spur/build/plugins.int 2014-10-22 02:17:13 UTC (rev 3106) @@ -1,5 +1,6 @@ # Copied, perhaps edited, from ../../../nscogsrc/examplePlugins.int INTERNAL_PLUGINS = \ +AioPlugin \ AsynchFilePlugin \ BMPReadWriterPlugin \ B2DPlugin \ Modified: branches/Cog/build.linux32x86/newspeak.cog.spur/build.assert/plugins.int =================================================================== --- branches/Cog/build.linux32x86/newspeak.cog.spur/build.assert/plugins.int 2014-10-14 19:54:42 UTC (rev 3105) +++ branches/Cog/build.linux32x86/newspeak.cog.spur/build.assert/plugins.int 2014-10-22 02:17:13 UTC (rev 3106) @@ -1,5 +1,6 @@ # Copied, perhaps edited, from ../../../nscogsrc/examplePlugins.int INTERNAL_PLUGINS = \ +AioPlugin \ AsynchFilePlugin \ BMPReadWriterPlugin \ B2DPlugin \ Modified: branches/Cog/build.linux32x86/newspeak.cog.spur/build.assert.itimerheartbea… =================================================================== --- branches/Cog/build.linux32x86/newspeak.cog.spur/build.assert.itimerheartbea… 2014-10-14 19:54:42 UTC (rev 3105) +++ branches/Cog/build.linux32x86/newspeak.cog.spur/build.assert.itimerheartbea… 2014-10-22 02:17:13 UTC (rev 3106) @@ -1,5 +1,6 @@ # Copied, perhaps edited, from ../../../nscogsrc/examplePlugins.int INTERNAL_PLUGINS = \ +AioPlugin \ AsynchFilePlugin \ BMPReadWriterPlugin \ B2DPlugin \ Modified: branches/Cog/build.linux32x86/newspeak.cog.spur/build.debug/plugins.int =================================================================== --- branches/Cog/build.linux32x86/newspeak.cog.spur/build.debug/plugins.int 2014-10-14 19:54:42 UTC (rev 3105) +++ branches/Cog/build.linux32x86/newspeak.cog.spur/build.debug/plugins.int 2014-10-22 02:17:13 UTC (rev 3106) @@ -1,5 +1,6 @@ # Copied, perhaps edited, from ../../../nscogsrc/examplePlugins.int INTERNAL_PLUGINS = \ +AioPlugin \ AsynchFilePlugin \ BMPReadWriterPlugin \ B2DPlugin \ Modified: branches/Cog/build.linux32x86/newspeak.cog.spur/build.debug.itimerheartbeat… =================================================================== --- branches/Cog/build.linux32x86/newspeak.cog.spur/build.debug.itimerheartbeat… 2014-10-14 19:54:42 UTC (rev 3105) +++ branches/Cog/build.linux32x86/newspeak.cog.spur/build.debug.itimerheartbeat… 2014-10-22 02:17:13 UTC (rev 3106) @@ -1,5 +1,6 @@ # Copied, perhaps edited, from ../../../nscogsrc/examplePlugins.int INTERNAL_PLUGINS = \ +AioPlugin \ AsynchFilePlugin \ BMPReadWriterPlugin \ B2DPlugin \ Modified: branches/Cog/build.linux32x86/newspeak.cog.spur/build.itimerheartbeat/plugi… =================================================================== --- branches/Cog/build.linux32x86/newspeak.cog.spur/build.itimerheartbeat/plugi… 2014-10-14 19:54:42 UTC (rev 3105) +++ branches/Cog/build.linux32x86/newspeak.cog.spur/build.itimerheartbeat/plugi… 2014-10-22 02:17:13 UTC (rev 3106) @@ -1,5 +1,6 @@ # Copied, perhaps edited, from ../../../nscogsrc/examplePlugins.int INTERNAL_PLUGINS = \ +AioPlugin \ AsynchFilePlugin \ BMPReadWriterPlugin \ B2DPlugin \ Modified: branches/Cog/build.linux32x86/newspeak.cog.v3/build/plugins.int =================================================================== --- branches/Cog/build.linux32x86/newspeak.cog.v3/build/plugins.int 2014-10-14 19:54:42 UTC (rev 3105) +++ branches/Cog/build.linux32x86/newspeak.cog.v3/build/plugins.int 2014-10-22 02:17:13 UTC (rev 3106) @@ -1,5 +1,6 @@ # Copied, perhaps edited, from ../../../nscogsrc/examplePlugins.int INTERNAL_PLUGINS = \ +AioPlugin \ AsynchFilePlugin \ BMPReadWriterPlugin \ B2DPlugin \ Modified: branches/Cog/build.linux32x86/newspeak.cog.v3/build.assert/plugins.int =================================================================== --- branches/Cog/build.linux32x86/newspeak.cog.v3/build.assert/plugins.int 2014-10-14 19:54:42 UTC (rev 3105) +++ branches/Cog/build.linux32x86/newspeak.cog.v3/build.assert/plugins.int 2014-10-22 02:17:13 UTC (rev 3106) @@ -1,5 +1,6 @@ # Copied, perhaps edited, from ../../../nscogsrc/examplePlugins.int INTERNAL_PLUGINS = \ +AioPlugin \ AsynchFilePlugin \ BMPReadWriterPlugin \ B2DPlugin \ Modified: branches/Cog/build.linux32x86/newspeak.cog.v3/build.assert.itimerheartbeat/… =================================================================== --- branches/Cog/build.linux32x86/newspeak.cog.v3/build.assert.itimerheartbeat/… 2014-10-14 19:54:42 UTC (rev 3105) +++ branches/Cog/build.linux32x86/newspeak.cog.v3/build.assert.itimerheartbeat/… 2014-10-22 02:17:13 UTC (rev 3106) @@ -1,5 +1,6 @@ # Copied, perhaps edited, from ../../../nscogsrc/examplePlugins.int INTERNAL_PLUGINS = \ +AioPlugin \ AsynchFilePlugin \ BMPReadWriterPlugin \ B2DPlugin \ Modified: branches/Cog/build.linux32x86/newspeak.cog.v3/build.debug/plugins.int =================================================================== --- branches/Cog/build.linux32x86/newspeak.cog.v3/build.debug/plugins.int 2014-10-14 19:54:42 UTC (rev 3105) +++ branches/Cog/build.linux32x86/newspeak.cog.v3/build.debug/plugins.int 2014-10-22 02:17:13 UTC (rev 3106) @@ -1,5 +1,6 @@ # Copied, perhaps edited, from ../../../nscogsrc/examplePlugins.int INTERNAL_PLUGINS = \ +AioPlugin \ AsynchFilePlugin \ BMPReadWriterPlugin \ B2DPlugin \ Modified: branches/Cog/build.linux32x86/newspeak.cog.v3/build.debug.itimerheartbeat/p… =================================================================== --- branches/Cog/build.linux32x86/newspeak.cog.v3/build.debug.itimerheartbeat/p… 2014-10-14 19:54:42 UTC (rev 3105) +++ branches/Cog/build.linux32x86/newspeak.cog.v3/build.debug.itimerheartbeat/p… 2014-10-22 02:17:13 UTC (rev 3106) @@ -1,5 +1,6 @@ # Copied, perhaps edited, from ../../../nscogsrc/examplePlugins.int INTERNAL_PLUGINS = \ +AioPlugin \ AsynchFilePlugin \ BMPReadWriterPlugin \ B2DPlugin \ Modified: branches/Cog/build.linux32x86/newspeak.cog.v3/build.itimerheartbeat/plugins… =================================================================== --- branches/Cog/build.linux32x86/newspeak.cog.v3/build.itimerheartbeat/plugins… 2014-10-14 19:54:42 UTC (rev 3105) +++ branches/Cog/build.linux32x86/newspeak.cog.v3/build.itimerheartbeat/plugins… 2014-10-22 02:17:13 UTC (rev 3106) @@ -1,5 +1,6 @@ # Copied, perhaps edited, from ../../../nscogsrc/examplePlugins.int INTERNAL_PLUGINS = \ +AioPlugin \ AsynchFilePlugin \ BMPReadWriterPlugin \ B2DPlugin \ Modified: branches/Cog/build.linux32x86/newspeak.sista.spur/build/plugins.int =================================================================== --- branches/Cog/build.linux32x86/newspeak.sista.spur/build/plugins.int 2014-10-14 19:54:42 UTC (rev 3105) +++ branches/Cog/build.linux32x86/newspeak.sista.spur/build/plugins.int 2014-10-22 02:17:13 UTC (rev 3106) @@ -1,5 +1,6 @@ # Copied, perhaps edited, from ../../../nscogsrc/examplePlugins.int INTERNAL_PLUGINS = \ +AioPlugin \ AsynchFilePlugin \ BMPReadWriterPlugin \ B2DPlugin \ Modified: branches/Cog/build.linux32x86/newspeak.sista.spur/build.assert/plugins.int =================================================================== --- branches/Cog/build.linux32x86/newspeak.sista.spur/build.assert/plugins.int 2014-10-14 19:54:42 UTC (rev 3105) +++ branches/Cog/build.linux32x86/newspeak.sista.spur/build.assert/plugins.int 2014-10-22 02:17:13 UTC (rev 3106) @@ -1,5 +1,6 @@ # Copied, perhaps edited, from ../../../nscogsrc/examplePlugins.int INTERNAL_PLUGINS = \ +AioPlugin \ AsynchFilePlugin \ BMPReadWriterPlugin \ B2DPlugin \ Modified: branches/Cog/build.linux32x86/newspeak.sista.spur/build.assert.itimerheartb… =================================================================== --- branches/Cog/build.linux32x86/newspeak.sista.spur/build.assert.itimerheartb… 2014-10-14 19:54:42 UTC (rev 3105) +++ branches/Cog/build.linux32x86/newspeak.sista.spur/build.assert.itimerheartb… 2014-10-22 02:17:13 UTC (rev 3106) @@ -1,5 +1,6 @@ # Copied, perhaps edited, from ../../../nscogsrc/examplePlugins.int INTERNAL_PLUGINS = \ +AioPlugin \ AsynchFilePlugin \ BMPReadWriterPlugin \ B2DPlugin \ Modified: branches/Cog/build.linux32x86/newspeak.sista.spur/build.debug/plugins.int =================================================================== --- branches/Cog/build.linux32x86/newspeak.sista.spur/build.debug/plugins.int 2014-10-14 19:54:42 UTC (rev 3105) +++ branches/Cog/build.linux32x86/newspeak.sista.spur/build.debug/plugins.int 2014-10-22 02:17:13 UTC (rev 3106) @@ -1,5 +1,6 @@ # Copied, perhaps edited, from ../../../nscogsrc/examplePlugins.int INTERNAL_PLUGINS = \ +AioPlugin \ AsynchFilePlugin \ BMPReadWriterPlugin \ B2DPlugin \ Modified: branches/Cog/build.linux32x86/newspeak.sista.spur/build.debug.itimerheartbe… =================================================================== --- branches/Cog/build.linux32x86/newspeak.sista.spur/build.debug.itimerheartbe… 2014-10-14 19:54:42 UTC (rev 3105) +++ branches/Cog/build.linux32x86/newspeak.sista.spur/build.debug.itimerheartbe… 2014-10-22 02:17:13 UTC (rev 3106) @@ -1,5 +1,6 @@ # Copied, perhaps edited, from ../../../nscogsrc/examplePlugins.int INTERNAL_PLUGINS = \ +AioPlugin \ AsynchFilePlugin \ BMPReadWriterPlugin \ B2DPlugin \ Modified: branches/Cog/build.linux32x86/newspeak.sista.spur/build.itimerheartbeat/plu… =================================================================== --- branches/Cog/build.linux32x86/newspeak.sista.spur/build.itimerheartbeat/plu… 2014-10-14 19:54:42 UTC (rev 3105) +++ branches/Cog/build.linux32x86/newspeak.sista.spur/build.itimerheartbeat/plu… 2014-10-22 02:17:13 UTC (rev 3106) @@ -1,5 +1,6 @@ # Copied, perhaps edited, from ../../../nscogsrc/examplePlugins.int INTERNAL_PLUGINS = \ +AioPlugin \ AsynchFilePlugin \ BMPReadWriterPlugin \ B2DPlugin \ Modified: branches/Cog/build.linux32x86/newspeak.sista.v3/build/plugins.int =================================================================== --- branches/Cog/build.linux32x86/newspeak.sista.v3/build/plugins.int 2014-10-14 19:54:42 UTC (rev 3105) +++ branches/Cog/build.linux32x86/newspeak.sista.v3/build/plugins.int 2014-10-22 02:17:13 UTC (rev 3106) @@ -1,5 +1,6 @@ # Copied, perhaps edited, from ../../../nscogsrc/examplePlugins.int INTERNAL_PLUGINS = \ +AioPlugin \ AsynchFilePlugin \ BMPReadWriterPlugin \ B2DPlugin \ Modified: branches/Cog/build.linux32x86/newspeak.sista.v3/build.assert/plugins.int =================================================================== --- branches/Cog/build.linux32x86/newspeak.sista.v3/build.assert/plugins.int 2014-10-14 19:54:42 UTC (rev 3105) +++ branches/Cog/build.linux32x86/newspeak.sista.v3/build.assert/plugins.int 2014-10-22 02:17:13 UTC (rev 3106) @@ -1,5 +1,6 @@ # Copied, perhaps edited, from ../../../nscogsrc/examplePlugins.int INTERNAL_PLUGINS = \ +AioPlugin \ AsynchFilePlugin \ BMPReadWriterPlugin \ B2DPlugin \ Modified: branches/Cog/build.linux32x86/newspeak.sista.v3/build.assert.itimerheartbea… =================================================================== --- branches/Cog/build.linux32x86/newspeak.sista.v3/build.assert.itimerheartbea… 2014-10-14 19:54:42 UTC (rev 3105) +++ branches/Cog/build.linux32x86/newspeak.sista.v3/build.assert.itimerheartbea… 2014-10-22 02:17:13 UTC (rev 3106) @@ -1,5 +1,6 @@ # Copied, perhaps edited, from ../../../nscogsrc/examplePlugins.int INTERNAL_PLUGINS = \ +AioPlugin \ AsynchFilePlugin \ BMPReadWriterPlugin \ B2DPlugin \ Modified: branches/Cog/build.linux32x86/newspeak.sista.v3/build.debug/plugins.int =================================================================== --- branches/Cog/build.linux32x86/newspeak.sista.v3/build.debug/plugins.int 2014-10-14 19:54:42 UTC (rev 3105) +++ branches/Cog/build.linux32x86/newspeak.sista.v3/build.debug/plugins.int 2014-10-22 02:17:13 UTC (rev 3106) @@ -1,5 +1,6 @@ # Copied, perhaps edited, from ../../../nscogsrc/examplePlugins.int INTERNAL_PLUGINS = \ +AioPlugin \ AsynchFilePlugin \ BMPReadWriterPlugin \ B2DPlugin \ Modified: branches/Cog/build.linux32x86/newspeak.sista.v3/build.debug.itimerheartbeat… =================================================================== --- branches/Cog/build.linux32x86/newspeak.sista.v3/build.debug.itimerheartbeat… 2014-10-14 19:54:42 UTC (rev 3105) +++ branches/Cog/build.linux32x86/newspeak.sista.v3/build.debug.itimerheartbeat… 2014-10-22 02:17:13 UTC (rev 3106) @@ -1,5 +1,6 @@ # Copied, perhaps edited, from ../../../nscogsrc/examplePlugins.int INTERNAL_PLUGINS = \ +AioPlugin \ AsynchFilePlugin \ BMPReadWriterPlugin \ B2DPlugin \ Modified: branches/Cog/build.linux32x86/newspeak.sista.v3/build.itimerheartbeat/plugi… =================================================================== --- branches/Cog/build.linux32x86/newspeak.sista.v3/build.itimerheartbeat/plugi… 2014-10-14 19:54:42 UTC (rev 3105) +++ branches/Cog/build.linux32x86/newspeak.sista.v3/build.itimerheartbeat/plugi… 2014-10-22 02:17:13 UTC (rev 3106) @@ -1,5 +1,6 @@ # Copied, perhaps edited, from ../../../nscogsrc/examplePlugins.int INTERNAL_PLUGINS = \ +AioPlugin \ AsynchFilePlugin \ BMPReadWriterPlugin \ B2DPlugin \ Modified: branches/Cog/build.linux32x86/newspeak.stack.spur/build/plugins.int =================================================================== --- branches/Cog/build.linux32x86/newspeak.stack.spur/build/plugins.int 2014-10-14 19:54:42 UTC (rev 3105) +++ branches/Cog/build.linux32x86/newspeak.stack.spur/build/plugins.int 2014-10-22 02:17:13 UTC (rev 3106) @@ -1,5 +1,6 @@ # Copied, perhaps edited, from ../../../nscogsrc/examplePlugins.int INTERNAL_PLUGINS = \ +AioPlugin \ AsynchFilePlugin \ BMPReadWriterPlugin \ B2DPlugin \ Modified: branches/Cog/build.linux32x86/newspeak.stack.spur/build.assert/plugins.int =================================================================== --- branches/Cog/build.linux32x86/newspeak.stack.spur/build.assert/plugins.int 2014-10-14 19:54:42 UTC (rev 3105) +++ branches/Cog/build.linux32x86/newspeak.stack.spur/build.assert/plugins.int 2014-10-22 02:17:13 UTC (rev 3106) @@ -1,5 +1,6 @@ # Copied, perhaps edited, from ../../../nscogsrc/examplePlugins.int INTERNAL_PLUGINS = \ +AioPlugin \ AsynchFilePlugin \ BMPReadWriterPlugin \ B2DPlugin \ Modified: branches/Cog/build.linux32x86/newspeak.stack.spur/build.debug/plugins.int =================================================================== --- branches/Cog/build.linux32x86/newspeak.stack.spur/build.debug/plugins.int 2014-10-14 19:54:42 UTC (rev 3105) +++ branches/Cog/build.linux32x86/newspeak.stack.spur/build.debug/plugins.int 2014-10-22 02:17:13 UTC (rev 3106) @@ -1,5 +1,6 @@ # Copied, perhaps edited, from ../../../nscogsrc/examplePlugins.int INTERNAL_PLUGINS = \ +AioPlugin \ AsynchFilePlugin \ BMPReadWriterPlugin \ B2DPlugin \ Modified: branches/Cog/build.linux32x86/newspeak.stack.v3/build/plugins.int =================================================================== --- branches/Cog/build.linux32x86/newspeak.stack.v3/build/plugins.int 2014-10-14 19:54:42 UTC (rev 3105) +++ branches/Cog/build.linux32x86/newspeak.stack.v3/build/plugins.int 2014-10-22 02:17:13 UTC (rev 3106) @@ -1,5 +1,6 @@ # Copied, perhaps edited, from ../../../nscogsrc/examplePlugins.int INTERNAL_PLUGINS = \ +AioPlugin \ AsynchFilePlugin \ BMPReadWriterPlugin \ B2DPlugin \ Modified: branches/Cog/build.linux32x86/newspeak.stack.v3/build.assert/plugins.int =================================================================== --- branches/Cog/build.linux32x86/newspeak.stack.v3/build.assert/plugins.int 2014-10-14 19:54:42 UTC (rev 3105) +++ branches/Cog/build.linux32x86/newspeak.stack.v3/build.assert/plugins.int 2014-10-22 02:17:13 UTC (rev 3106) @@ -1,5 +1,6 @@ # Copied, perhaps edited, from ../../../nscogsrc/examplePlugins.int INTERNAL_PLUGINS = \ +AioPlugin \ AsynchFilePlugin \ BMPReadWriterPlugin \ B2DPlugin \ Modified: branches/Cog/build.linux32x86/newspeak.stack.v3/build.debug/plugins.int =================================================================== --- branches/Cog/build.linux32x86/newspeak.stack.v3/build.debug/plugins.int 2014-10-14 19:54:42 UTC (rev 3105) +++ branches/Cog/build.linux32x86/newspeak.stack.v3/build.debug/plugins.int 2014-10-22 02:17:13 UTC (rev 3106) @@ -1,5 +1,6 @@ # Copied, perhaps edited, from ../../../nscogsrc/examplePlugins.int INTERNAL_PLUGINS = \ +AioPlugin \ AsynchFilePlugin \ BMPReadWriterPlugin \ B2DPlugin \ Modified: branches/Cog/image/buildspurtrunkimage.sh =================================================================== --- branches/Cog/image/buildspurtrunkimage.sh 2014-10-14 19:54:42 UTC (rev 3105) +++ branches/Cog/image/buildspurtrunkimage.sh 2014-10-22 02:17:13 UTC (rev 3106) @@ -11,9 +11,10 @@ $VM trunk46forspur.image BuildSqueakTrunkImage.st fi -rm -f temp-spur-repository/* temp-v3-repository/* -echo $VM trunk46forspur.image WriteSpurPackagesToTempDir.st -$VM trunk46forspur.image WriteSpurPackagesToTempDir.st +#Old code pre patchAndUploadUnpatchedInTrunk +#rm -f temp-spur-repository/* temp-v3-repository/* +#echo $VM trunk46forspur.image WriteSpurPackagesToTempDir.st +#$VM trunk46forspur.image WriteSpurPackagesToTempDir.st # Now choose a suitable VMMaker image (Spur preferred) and get it to convert # trunk46forspur to Spur. @@ -52,5 +53,7 @@ # Now load the modified packages . ./getGoodSpurVM.sh -echo $VM -blockonerror trunk46-spur.image LoadSpurPackagesFromTempDir.st -$VM -blockonerror trunk46-spur.image LoadSpurPackagesFromTempDir.st +echo $VM -blockonerror trunk46-spur.image LoadSpurPackages.st +$VM -blockonerror trunk46-spur.image LoadSpurPackages.st + +./resizesqueakwindow.sh trunk46-spur.image 800 600 Modified: branches/Cog/image/getGoodCogNsvm.sh =================================================================== --- branches/Cog/image/getGoodCogNsvm.sh 2014-10-14 19:54:42 UTC (rev 3105) +++ branches/Cog/image/getGoodCogNsvm.sh 2014-10-22 02:17:13 UTC (rev 3106) @@ -1,32 +1,32 @@ #!/bin/sh -# Sets the VM env var to the r3095 Newspeak VM for the current platform. +# Sets the VM env var to the r3104 Newspeak VM for the current platform. # will download and install the VM in this directory if necessary. -TAG=14.39.3095 -REV=3095 -LCBINDIR=4.0-3095 +TAG=14.41.3104 +REV=3104 +LCBINDIR=4.0-3104 URL=http://www.mirandabanda.org/files/Cog/VM/VM.r$REV/ . ./envvars.sh case "$OS" in Darwin) get_vm_from_tar \ - "Newspeak Virtual Machine.app/Contents/MacOS/Newspeak Virtual Machine" e84764bad961132c21db23a291b35d6c \ - "Newspeak Virtual Machine.app-$TAG.tgz" 0c8069350a057e03397b02adc85df31a + "Newspeak Virtual Machine.app/Contents/MacOS/Newspeak Virtual Machine" de5d9665b2e4a49d36059626238cefa4 \ + "Newspeak Virtual Machine.app-$TAG.tgz" f786ce8a9103c5d73457dd21d3af80cd VM="Newspeak Virtual Machine.app/Contents/MacOS/Newspeak Virtual Machine";; Linux) if expr $OSREL \> 2.6.12; then get_vm_from_tar \ nsvmlinuxht/lib/nsvm/$LCBINDIR/nsvm \ - nsvmlinuxht-$TAG.tgz b242db5776e35ceb34669313c5423eea + nsvmlinuxht-$TAG.tgz bde6c4aa584cfd25ec6c425ff8d7c476 else get_vm_from_tar \ nsvmlinux/lib/nsvm/$LCBINDIR/nsvm \ - nsvmlinux-$TAG.tgz d39847515fb436bd715e129cf37e79e9 + nsvmlinux-$TAG.tgz 2df70aec5d0b54577675d07c58211f06 fi;; CYGWIN*) get_vm_from_zip \ - nsvmwin/nsvmConsole.exe 05cddd5c752019af301815dd18996164 \ - nsvmwin-$TAG.zip c77545ac931d80fcc917b138c99746fa + nsvmwin/nsvmConsole.exe 71cd4966a2f9b76cd8b2d2fd4b942930 \ + nsvmwin-$TAG.zip 26e033b51244f444c1cc9b3a30c6ce6f VM=nsvmwin/nsvmConsole.exe;; *) echo "don't know how to run nsvm on your system. bailing out." 1>&2; exit 2 esac Modified: branches/Cog/image/getGoodCogVM.sh =================================================================== --- branches/Cog/image/getGoodCogVM.sh 2014-10-14 19:54:42 UTC (rev 3105) +++ branches/Cog/image/getGoodCogVM.sh 2014-10-22 02:17:13 UTC (rev 3106) @@ -1,32 +1,32 @@ #!/bin/sh -# Sets the VM env var to the r3095 Cog VM for the current platform. +# Sets the VM env var to the r3104 Cog VM for the current platform. # will download and install the VM in this directory if necessary. -TAG=14.39.3095 -REV=3095 -LCBINDIR=4.0-3095 +TAG=14.41.3104 +REV=3104 +LCBINDIR=4.0-3104 URL=http://www.mirandabanda.org/files/Cog/VM/VM.r$REV/ . ./envvars.sh case "$OS" in Darwin) get_vm_from_tar \ - Cog.app/Contents/MacOS/Squeak 4333a73cfdc82b98d5af6bc4214637cf \ - Cog.app-$TAG.tgz 876826f15ce25e120838459c6ae28c77 + Cog.app/Contents/MacOS/Squeak 87bccfaa11dafb2c8c16850cbd021fb2 \ + Cog.app-$TAG.tgz 3e75109726f0970a4e0e61869d1be212 VM=Cog.app/Contents/MacOS/Squeak;; Linux) if expr $OSREL \> 2.6.12; then get_vm_from_tar \ - coglinuxht/lib/squeak/$LCBINDIR/squeak c60d17a17c01a6e3540e2d44ff85b3fa \ - coglinuxht-$TAG.tgz 0e373fb98a13c39451cc7a10117a3b9e + coglinuxht/lib/squeak/$LCBINDIR/squeak 706c5ffb7023bd0a9a43d7b6c847df73 \ + coglinuxht-$TAG.tgz 9d09d5420139535a07af343418ee9985 else get_vm_from_tar \ - coglinux/lib/squeak/$LCBINDIR/squeak 0a1c7a1038202dc0fd2b9cd296e2e2ea \ - coglinux-$TAG.tgz 2d7acdf79117c107d62ffd587e8bfd19 + coglinux/lib/squeak/$LCBINDIR/squeak 1c7188ef81af887abd84b159af52bdaf \ + coglinux-$TAG.tgz d67b929fbbd20542abb62aaf8cc8cbca fi;; CYGWIN*) get_vm_from_zip \ - cogwin/SqueakConsole.exe c20ccbda88943dad5921c5cc3ca396d6 \ - cogwin-$TAG.zip 84b1167a6766d637b70d358a21ce895f + cogwin/SqueakConsole.exe a68530a6d08d2d043eb16ecb932b7383 \ + cogwin-$TAG.zip a66ba06907bdfdde191b1bf45a495cd2 VM=cogwin/SqueakConsole.exe;; *) echo "don't know how to run Squeak on your system. bailing out." 1>&2; exit 2 esac Modified: branches/Cog/image/getGoodSpurNsvm.sh =================================================================== --- branches/Cog/image/getGoodSpurNsvm.sh 2014-10-14 19:54:42 UTC (rev 3105) +++ branches/Cog/image/getGoodSpurNsvm.sh 2014-10-22 02:17:13 UTC (rev 3106) @@ -1,26 +1,26 @@ #!/bin/sh -# Sets the VM env var to the r3095 Newspeak Spur VM for the current platform. +# Sets the VM env var to the r3105 Newspeak Spur VM for the current platform. # will download and install the VM in this directory if necessary. -TAG=14.39.3095 -REV=3095 -LSBINDIR=5.0-3095 +TAG=14.41.3105 +REV=3105 +LSBINDIR=5.0-3105 URL=http://www.mirandabanda.org/files/Cog/VM/VM.r$REV/ . ./envvars.sh case "$OS" in Darwin) get_vm_from_tar \ - "Newspeak Spur Virtual Machine.app/Contents/MacOS/Newspeak Virtual Machine" e29b2cec39511ceb654976fb6663a119 \ - "Newspeak Spur Virtual Machine.app-$TAG.tgz" 252be83f5480eb853148b1189f826916 + "Newspeak Spur Virtual Machine.app/Contents/MacOS/Newspeak Virtual Machine" b9b6885517bb1ddcc33f1f042b66fc2f \ + "Newspeak Spur Virtual Machine.app-$TAG.tgz" 516e07fcdd4987ceaa9ce2a1452dc6ce VM="Newspeak Spur Virtual Machine.app/Contents/MacOS/Newspeak Virtual Machine";; Linux) get_vm_from_tar \ nsvmspurlinuxht/lib/nsvm/$LSBINDIR/nsvm \ - nsvmspurlinuxht-$TAG.tgz 6c9d6f70d345a0ff19003a55781a50e2 + nsvmspurlinuxht-$TAG.tgz 6e8cb761b039cc754887fa88a78cf5f7 VM=nsvmspurlinuxht/nsvm;; CYGWIN*) get_vm_from_zip \ - nsvmspurwin/nsvmConsole.exe d0c3c8bee789d2bb40f08bf09c5e0818 \ - nsvmspurwin-$TAG.zip 6b61b05a26022f1d0cbfb4f189efb8bf + nsvmspurwin/nsvmConsole.exe f89c87da16fe250063d3b3623b868e33 \ + nsvmspurwin-$TAG.zip 763b6c882f65a573c7615eb53f2b3aa7 VM=nsvmspurwin/nsvmConsole.exe;; *) echo "don't know how to run nsvm on your system. bailing out." 1>&2; exit 2 esac Modified: branches/Cog/image/getGoodSpurVM.sh =================================================================== --- branches/Cog/image/getGoodSpurVM.sh 2014-10-14 19:54:42 UTC (rev 3105) +++ branches/Cog/image/getGoodSpurVM.sh 2014-10-22 02:17:13 UTC (rev 3106) @@ -1,26 +1,26 @@ #!/bin/sh -# Sets the VM env var to the r3095 Cog Spur VM for the current platform. +# Sets the VM env var to the r3105 Cog Spur VM for the current platform. # will download and install the VM in this directory if necessary. -TAG=14.39.3095 -REV=3095 -LSBINDIR=5.0-3095 +TAG=14.41.3105 +REV=3105 +LSBINDIR=5.0-3105 URL=http://www.mirandabanda.org/files/Cog/VM/VM.r$REV/ . ./envvars.sh case "$OS" in Darwin) get_vm_from_tar \ - CogSpur.app/Contents/MacOS/Squeak 2b1088c7b33310ea3a3a71b0e7c2bf76 \ - CogSpur.app-$TAG.tgz 27bb41ea96cebe32f619cd694cb4f779 + CogSpur.app/Contents/MacOS/Squeak 13b57f63961b57045300785c8e116a56 \ + CogSpur.app-$TAG.tgz dae4205b5790577d0190c0c05f9548d0 VM=CogSpur.app/Contents/MacOS/Squeak;; Linux) get_vm_from_tar \ - cogspurlinuxht/lib/squeak/$LSBINDIR/squeak b549e5341e7c6cfd7902692055eaa5b8 \ - cogspurlinuxht-$TAG.tgz 621891e9bf782256a3e4e0c89d6e5929 + cogspurlinuxht/lib/squeak/$LSBINDIR/squeak 795aee1bd9a3d21eb1d02ecabf23b53a \ + cogspurlinuxht-$TAG.tgz fa3c82f64d6b9ea38618a1a60df8bb50 VM=cogspurlinuxht/squeak;; CYGWIN*) get_vm_from_zip \ - cogspurwin/SqueakConsole.exe ccd0f3ed63df616574c7f62ca03e6be0 \ - cogspurwin-$TAG.zip edc82d0157520b10e37f11438f687e33 + cogspurwin/SqueakConsole.exe 7e33a679a9125743460894498308a612 \ + cogspurwin-$TAG.zip 015eb95c8850d2aade5d731e3cd617d8 VM=cogspurwin/SqueakConsole.exe;; *) echo "don't know how to run Squeak on your system. bailing out." 1>&2; exit 2 esac Modified: branches/Cog/image/makegetnsvmscripts.sh =================================================================== --- branches/Cog/image/makegetnsvmscripts.sh 2014-10-14 19:54:42 UTC (rev 3105) +++ branches/Cog/image/makegetnsvmscripts.sh 2014-10-22 02:17:13 UTC (rev 3106) @@ -3,8 +3,6 @@ GetCogScript=getGoodCogNsvm.sh GetSpurScript=getGoodSpurNsvm.sh -cd `dirname $0` - REV= TAG= while getopts 'r:t:?' opt "$@"; do @@ -17,6 +15,11 @@ done shift `expr $OPTIND - 1` +cd `dirname $0` >/dev/null +SD=`basename $0 .sh`.$$ +trap 'rm -rf "$SD"; exit 2' HUP INT PIPE TERM 0 +mkdir $SD + test -n "$REV" || REV=`grep 'SvnRawRevisionString.*Rev:' ../platforms/Cross/vm/sqSCCSVersion.h \ | sed 's/^.*Rev: $[0-9][0-9]*$ $";/\1/'` test -n "$TAG" || TAG=`date +%g.%U.`$REV @@ -28,12 +31,18 @@ . ./envvars.sh ABORT= -for a in "Newspeak Virtual Machine.app-$TAG.tgz" "Newspeak Virtual Machine-$TAG.dmg" nsvmlinuxht-$TAG.tgz nsvmlinux-$TAG.tgz nsvmwin-$TAG.zip\ - "Newspeak Spur Virtual Machine.app-$TAG.tgz" "Newspeak Spur Virtual Machine-$TAG.dmg" nsvmspurlinuxht-$TAG.tgz nsvmspurwin-$TAG.zip +for a in "Newspeak Virtual Machine.app-$TAG.tgz" nsvmlinuxht-$TAG.tgz nsvmlinux-$TAG.tgz nsvmwin-$TAG.zip\ + "Newspeak Spur Virtual Machine.app-$TAG.tgz" nsvmspurlinuxht-$TAG.tgz nsvmspurwin-$TAG.zip do test -f "../products/$a" || echo $a does not exist + test -f "../products/$a" && (cd "$SD" >/dev/null; + case "$a" in + *.zip) unzip -q "../../products/$a";; + *) tar xzf "../../products/$a" + esac) ABORT=true done +test -n "$ABORT" || rm -rf "$SD" test -n "$ABORT" || exit 1 @@ -56,7 +65,7 @@ END echo -n ' "Newspeak Virtual Machine.app/Contents/MacOS/Newspeak Virtual Machine" ' >>$GetCogScript -echo -n `quietmd5 "../products/Newspeak Virtual Machine.app/Contents/MacOS/Newspeak Virtual Machine"` >>$GetCogScript +echo -n `quietmd5 "$SD/Newspeak Virtual Machine.app/Contents/MacOS/Newspeak Virtual Machine"` >>$GetCogScript echo ' \' >> $GetCogScript echo -n ' "Newspeak Virtual Machine.app-$TAG.tgz" ' >>$GetCogScript quietmd5 "../products/Newspeak Virtual Machine.app-$TAG.tgz" >>$GetCogScript @@ -69,7 +78,7 @@ END echo -n ' nsvmlinuxht/lib/nsvm/$LCBINDIR/nsvm ' >>$GetCogScript -echo -n `quietmd5 ../products/nsvmlinuxht/lib/nsvm/$LCBINDIR/nsvm` >>$GetCogScript +echo -n `quietmd5 $SD/nsvmlinuxht/lib/nsvm/$LCBINDIR/nsvm` >>$GetCogScript echo ' \' >>$GetCogScript echo -n ' nsvmlinuxht-$TAG.tgz ' >>$GetCogScript quietmd5 ../products/nsvmlinuxht-$TAG.tgz >>$GetCogScript @@ -80,7 +89,7 @@ END echo -n ' nsvmlinux/lib/nsvm/$LCBINDIR/nsvm ' >>$GetCogScript -echo -n `quietmd5 ../products/nsvmlinux/lib/nsvm/$LCBINDIR/nsvm` >>$GetCogScript +echo -n `quietmd5 $SD/nsvmlinux/lib/nsvm/$LCBINDIR/nsvm` >>$GetCogScript echo ' \' >>$GetCogScript echo -n ' nsvmlinux-$TAG.tgz ' >>$GetCogScript quietmd5 ../products/nsvmlinux-$TAG.tgz >>$GetCogScript @@ -90,7 +99,7 @@ END echo -n ' nsvmwin/nsvmConsole.exe ' >>$GetCogScript -echo -n `quietmd5 ../products/nsvmwin/nsvmConsole.exe` >>$GetCogScript +echo -n `quietmd5 $SD/nsvmwin/nsvmConsole.exe` >>$GetCogScript echo ' \' >>$GetCogScript echo -n ' nsvmwin-$TAG.zip ' >>$GetCogScript quietmd5 ../products/nsvmwin-$TAG.zip >>$GetCogScript @@ -120,7 +129,7 @@ END echo -n ' "Newspeak Spur Virtual Machine.app/Contents/MacOS/Newspeak Virtual Machine" ' >>$GetSpurScript -echo -n `quietmd5 ../products/"Newspeak Spur Virtual Machine.app/Contents/MacOS/Newspeak Virtual Machine"` >>$GetSpurScript +echo -n `quietmd5 "$SD/Newspeak Spur Virtual Machine.app/Contents/MacOS/Newspeak Virtual Machine"` >>$GetSpurScript echo ' \' >>$GetSpurScript echo -n ' "Newspeak Spur Virtual Machine.app-$TAG.tgz" ' >>$GetSpurScript quietmd5 "../products/Newspeak Spur Virtual Machine.app-$TAG.tgz" >>$GetSpurScript @@ -131,7 +140,7 @@ END echo -n ' nsvmspurlinuxht/lib/nsvm/$LSBINDIR/nsvm ' >>$GetSpurScript -echo -n `quietmd5 ../products/nsvmspurlinuxht/lib/nsvm/$LSBINDIR/nsvm` >>$GetSpurScript +echo -n `quietmd5 $SD/nsvmspurlinuxht/lib/nsvm/$LSBINDIR/nsvm` >>$GetSpurScript echo ' \' >>$GetSpurScript echo -n ' nsvmspurlinuxht-$TAG.tgz ' >>$GetSpurScript quietmd5 ../products/nsvmspurlinuxht-$TAG.tgz >>$GetSpurScript @@ -142,7 +151,7 @@ END echo -n ' nsvmspurwin/nsvmConsole.exe ' >>$GetSpurScript -echo -n `quietmd5 ../products/nsvmspurwin/nsvmConsole.exe` >>$GetSpurScript +echo -n `quietmd5 $SD/nsvmspurwin/nsvmConsole.exe` >>$GetSpurScript echo ' \' >>$GetSpurScript echo -n ' nsvmspurwin-$TAG.zip ' >>$GetSpurScript quietmd5 ../products/nsvmspurwin-$TAG.zip >>$GetSpurScript @@ -153,4 +162,5 @@ esac END +rm -rf "$SD" chmod a+x $GetSpurScript Modified: branches/Cog/image/makegetvmscripts.sh =================================================================== --- branches/Cog/image/makegetvmscripts.sh 2014-10-14 19:54:42 UTC (rev 3105) +++ branches/Cog/image/makegetvmscripts.sh 2014-10-22 02:17:13 UTC (rev 3106) @@ -3,8 +3,6 @@ GetCogScript=getGoodCogVM.sh GetSpurScript=getGoodSpurVM.sh -cd `dirname $0` - REV= TAG= while getopts 'r:t:?' opt "$@"; do @@ -17,6 +15,11 @@ done shift `expr $OPTIND - 1` +cd `dirname $0` >/dev/null +SD=`basename $0 .sh`.$$ +trap 'rm -rf "$SD"; exit 2' HUP INT PIPE TERM 0 +mkdir $SD + test -n "$REV" || REV=`grep 'SvnRawRevisionString.*Rev:' ../platforms/Cross/vm/sqSCCSVersion.h \ | sed 's/^.*Rev: $[0-9][0-9]*$ $";/\1/'` test -n "$TAG" || TAG=`date +%g.%U.`$REV @@ -32,10 +35,15 @@ CogSpur.app-$TAG.tgz cogspurlinuxht-$TAG.tgz cogspurwin-$TAG.zip do test -f ../products/$a || echo $a does not exist + test -f ../products/$a && (cd "$SD" >/dev/null; tar xzf ../../products/$a) ABORT=true done +test -n "$ABORT" || rm -rf "$SD" test -n "$ABORT" || exit 1 + +echo $GetCogScript $GetSpurScript + cat >$GetCogScript <<END #!/bin/sh # Sets the VM env var to the r$REV Cog VM for the current platform. @@ -53,7 +61,7 @@ END echo -n ' Cog.app/Contents/MacOS/Squeak ' >>$GetCogScript -echo -n `quietmd5 ../products/Cog.app/Contents/MacOS/Squeak` >>$GetCogScript +echo -n `quietmd5 "$SD/Cog.app/Contents/MacOS/Squeak"` >>$GetCogScript echo ' \' >>$GetCogScript echo -n ' Cog.app-$TAG.tgz ' >>$GetCogScript quietmd5 ../products/Cog.app-$TAG.tgz >>$GetCogScript @@ -66,7 +74,7 @@ END echo -n ' coglinuxht/lib/squeak/$LCBINDIR/squeak ' >>$GetCogScript -echo -n `quietmd5 ../products/coglinuxht/lib/squeak/$LCBINDIR/squeak` >>$GetCogScript +echo -n `quietmd5 $SD/coglinuxht/lib/squeak/$LCBINDIR/squeak` >>$GetCogScript echo ' \' >>$GetCogScript echo -n ' coglinuxht-$TAG.tgz ' >>$GetCogScript quietmd5 ../products/coglinuxht-$TAG.tgz >>$GetCogScript @@ -77,7 +85,7 @@ END echo -n ' coglinux/lib/squeak/$LCBINDIR/squeak ' >>$GetCogScript -echo -n `quietmd5 ../products/coglinux/lib/squeak/$LCBINDIR/squeak` >>$GetCogScript +echo -n `quietmd5 $SD/coglinux/lib/squeak/$LCBINDIR/squeak` >>$GetCogScript echo ' \' >>$GetCogScript echo -n ' coglinux-$TAG.tgz ' >>$GetCogScript quietmd5 ../products/coglinux-$TAG.tgz >>$GetCogScript @@ -87,7 +95,7 @@ END echo -n ' cogwin/SqueakConsole.exe ' >>$GetCogScript -echo -n `quietmd5 ../products/cogwin/SqueakConsole.exe` >>$GetCogScript +echo -n `quietmd5 $SD/cogwin/SqueakConsole.exe` >>$GetCogScript echo ' \' >>$GetCogScript echo -n ' cogwin-$TAG.zip ' >>$GetCogScript quietmd5 ../products/cogwin-$TAG.zip >>$GetCogScript @@ -117,7 +125,7 @@ END echo -n ' CogSpur.app/Contents/MacOS/Squeak ' >>$GetSpurScript -echo -n `quietmd5 ../products/CogSpur.app/Contents/MacOS/Squeak` >>$GetSpurScript +echo -n `quietmd5 $SD/CogSpur.app/Contents/MacOS/Squeak` >>$GetSpurScript echo ' \' >>$GetSpurScript echo -n ' CogSpur.app-$TAG.tgz ' >>$GetSpurScript quietmd5 ../products/CogSpur.app-$TAG.tgz >>$GetSpurScript @@ -128,7 +136,7 @@ END echo -n ' cogspurlinuxht/lib/squeak/$LSBINDIR/squeak ' >>$GetSpurScript -echo -n `quietmd5 ../products/cogspurlinuxht/lib/squeak/$LSBINDIR/squeak` >>$GetSpurScript +echo -n `quietmd5 $SD/cogspurlinuxht/lib/squeak/$LSBINDIR/squeak` >>$GetSpurScript echo ' \' >>$GetSpurScript echo -n ' cogspurlinuxht-$TAG.tgz ' >>$GetSpurScript quietmd5 ../products/cogspurlinuxht-$TAG.tgz >>$GetSpurScript @@ -139,7 +147,7 @@ END echo -n ' cogspurwin/SqueakConsole.exe ' >>$GetSpurScript -echo -n `quietmd5 ../products/cogspurwin/SqueakConsole.exe` >>$GetSpurScript +echo -n `quietmd5 $SD/cogspurwin/SqueakConsole.exe` >>$GetSpurScript echo ' \' >>$GetSpurScript echo -n ' cogspurwin-$TAG.zip ' >>$GetSpurScript quietmd5 ../products/cogspurwin-$TAG.zip >>$GetSpurScript @@ -150,4 +158,5 @@ esac END +rm -rf "$SD" chmod a+x $GetSpurScript Added: branches/Cog/image/resizesqueakwindow.sh =================================================================== --- branches/Cog/image/resizesqueakwindow.sh (rev 0) +++ branches/Cog/image/resizesqueakwindow.sh 2014-10-22 02:17:13 UTC (rev 3106) @@ -0,0 +1,7 @@ +#!/bin/sh +if [ $# -ne 3 ]; then + echo "Usage: `basename $0` <image> <width> <height>" + exit 1 +fi +echo -ne \\x$(printf "%02X" $[$3%256])\\x$(printf "%02X" $[$3/256])\\x$(printf "%02X" $[$2%256])\\x$(printf "%02X" $[$2/256]) \ +| dd of="$1" obs=1 seek=24 conv=block,notrunc cbs=4 Property changes on: branches/Cog/image/resizesqueakwindow.sh ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/nscogsrc/plugins/AioPlugin/AioPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/AioPlugin/AioPlugin.c (rev 0) +++ branches/Cog/nscogsrc/plugins/AioPlugin/AioPlugin.c 2014-10-22 02:17:13 UTC (rev 3106) @@ -0,0 +1,737 @@ +/* Automatically generated by + VMPluginCodeGenerator VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 + from + UnixAioPlugin VMConstruction-Plugins-AioPlugin-eem.15 uuid: 0029df1c-3720-4b61-8579-4851417d24a7 + */ +static char __buildInfo[] = "UnixAioPlugin VMConstruction-Plugins-AioPlugin-eem.15 uuid: 0029df1c-3720-4b61-8579-4851417d24a7 " __DATE__ ; + + + +#include <math.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <time.h> +#include <unistd.h> +#define FILEHANDLETYPE FILE * /* the type of low level stream to be used in a struct SQFile */ + +/* Default EXPORT macro that does nothing (see comment in sq.h): */ +#define EXPORT(returnType) returnType + +/* Do not include the entire sq.h file but just those parts needed. */ +/* The virtual machine proxy definition */ +#include "sqVirtualMachine.h" +/* Configuration options */ +#include "sqConfig.h" +/* Platform specific definitions */ +#include "sqPlatformSpecific.h" + +#define true 1 +#define false 0 +#define null 0 /* using 'null' because nil is predefined in Think C */ +#ifdef SQUEAK_BUILTIN_PLUGIN +#undef EXPORT +// was #undef EXPORT(returnType) but screws NorCroft cc +#define EXPORT(returnType) static returnType +#endif + +#include "FilePlugin.h" +#include "SocketPlugin.h" +#include "config.h" +#define SESSIONIDENTIFIERTYPE int +#include "sqaio.h" +#include "sqMemoryAccess.h" + + +/*** Constants ***/ + + +/*** Function Prototypes ***/ +static void aioForwardwithDataandFlags(int fd, void *data, int flags); +static sqInt fileDescriptorFrom(sqInt aSQFileByteArray); +static FILEHANDLETYPE fileHandleFrom(sqInt sqFileStructByteArray); +static sqInt fileRecordSize(void); +static SQFile * fileValueOf(sqInt anSQFileRecord); +static VirtualMachine * getInterpreter(void); +EXPORT(const char*) getModuleName(void); +static sqInt getThisSessionIdentifier(void); +static sqInt halt(void); +EXPORT(sqInt) initialiseModule(void); +static sqInt isNonNullSQFile(sqInt objectPointer); +static sqInt isNullSQSocket(sqInt objectPointer); +static sqInt isSQFileObject(sqInt objectPointer); +static sqInt isSQSocketObject(sqInt objectPointer); +static sqInt isValidFileSession(sqInt objectPointer); +EXPORT(sqInt) moduleUnloaded(char *aModuleName); +static sqInt msg(char *s); +EXPORT(sqInt) primitiveAioDisable(void); +EXPORT(sqInt) primitiveAioEnable(void); +EXPORT(sqInt) primitiveAioHandle(void); +EXPORT(sqInt) primitiveAioSuspend(void); +EXPORT(sqInt) primitiveModuleName(void); +EXPORT(sqInt) primitiveOSFileHandle(void); +EXPORT(sqInt) primitiveOSSocketHandle(void); +EXPORT(sqInt) primitiveVersionString(void); +static SESSIONIDENTIFIERTYPE sessionIdentifierFromSqFile(SQFile *sqFile); +EXPORT(sqInt) setInterpreter(struct VirtualMachine*anInterpreter); +EXPORT(sqInt) shutdownModule(void); +static int socketDescriptorFrom(sqInt sqSocketOop); +static sqInt socketRecordSize(void); +static SQSocket * socketValueOf(sqInt anSQSocketRecord); +static sqInt stringFromCString(const char *aCString); +static char * versionString(void); + + +/*** Variables ***/ + +#if !defined(SQUEAK_BUILTIN_PLUGIN) +static void * (*arrayValueOf)(sqInt oop); +static sqInt (*byteSizeOf)(sqInt oop); +static sqInt (*classString)(void); +static sqInt (*getThisSessionID)(void); +static sqInt (*instantiateClassindexableSize)(sqInt classPointer, sqInt size); +static sqInt (*isBytes)(sqInt oop); +static sqInt (*nilObject)(void); +static sqInt (*pop)(sqInt nItems); +static sqInt (*popthenPush)(sqInt nItems, sqInt oop); +static sqInt (*primitiveFail)(void); +static sqInt (*pushInteger)(sqInt integerValue); +static sqInt (*signalSemaphoreWithIndex)(sqInt semaIndex); +static sqInt (*stackIntegerValue)(sqInt offset); +static sqInt (*stackObjectValue)(sqInt offset); +static sqInt (*stackValue)(sqInt offset); +static sqInt (*trueObject)(void); +#else /* !defined(SQUEAK_BUILTIN_PLUGIN) */ +extern void * arrayValueOf(sqInt oop); +extern sqInt byteSizeOf(sqInt oop); +extern sqInt classString(void); +extern sqInt getThisSessionID(void); +extern sqInt instantiateClassindexableSize(sqInt classPointer, sqInt size); +extern sqInt isBytes(sqInt oop); +extern sqInt nilObject(void); +extern sqInt pop(sqInt nItems); +extern sqInt popthenPush(sqInt nItems, sqInt oop); +extern sqInt primitiveFail(void); +extern sqInt pushInteger(sqInt integerValue); +extern sqInt signalSemaphoreWithIndex(sqInt semaIndex); +extern sqInt stackIntegerValue(sqInt offset); +extern sqInt stackObjectValue(sqInt offset); +extern sqInt stackValue(sqInt offset); +extern sqInt trueObject(void); +extern +#endif +struct VirtualMachine* interpreterProxy; +static const char *moduleName = +#ifdef SQUEAK_BUILTIN_PLUGIN + "AioPlugin VMConstruction-Plugins-AioPlugin-eem.15 (i)" +#else + "AioPlugin VMConstruction-Plugins-AioPlugin-eem.15 (e)" +#endif +; + + + +/* This function is called to signal a Smalltalk Semaphore when an + asynchronous event is + detected. When translated to C, the name of this method is + aioForwardwithDataandFlags. The event handler is set up by + #primitiveAioHandle. + */ + +static void +aioForwardwithDataandFlags(int fd, void *data, int flags) +{ + int *pfd; + sqInt semaIndex; + + pfd = data; + semaIndex = *pfd; + signalSemaphoreWithIndex(semaIndex); +} + + +/* Answer the OS file descriptor, an integer value, from a SQFile data + structure byte array, or answer -1 if unable to obtain the file descriptor + (probably due + to receiving an incorrect type of object as aFileHandle). + */ +/* return type should be int, but skip the declaration to permit inlining */ + +static sqInt +fileDescriptorFrom(sqInt aSQFileByteArray) +{ + if (!((((isBytes(aSQFileByteArray)) + && ((byteSizeOf(aSQFileByteArray)) == (fileRecordSize()))) + && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(aSQFileByteArray))))) + && (isNonNullSQFile(aSQFileByteArray)))) { + return -1; + } + return fileno(fileHandleFrom(aSQFileByteArray)); +} + + +/* Answer a file handle from a SQFile structure. On most platforms, this + will be a (FILE *). On Win32, it is a HANDLE. */ + +static FILEHANDLETYPE +fileHandleFrom(sqInt sqFileStructByteArray) +{ + SQFile *sqFile; + + sqFile = arrayValueOf(sqFileStructByteArray); + return sqFile->file; +} + + +/* Answer the size of a SQFile data structure in bytes. */ + +static sqInt +fileRecordSize(void) +{ + return sizeof(SQFile); +} + + +/* Return a pointer to the first byte of of the SQFile data structure file + record within + anSQFileRecord, which is expected to be a ByteArray of size + self>>fileRecordSize. + */ + +static SQFile * +fileValueOf(sqInt anSQFileRecord) +{ + return arrayValueOf(anSQFileRecord); +} + + +/* Note: This is coded so that plugins can be run from Squeak. */ + +static VirtualMachine * +getInterpreter(void) +{ + return interpreterProxy; +} + + +/* Note: This is hardcoded so it can be run from Squeak. + The module name is used for validating a module *after* + it is loaded to check if it does really contain the module + we're thinking it contains. This is important! */ + +EXPORT(const char*) +getModuleName(void) +{ + return moduleName; +} + +static sqInt +getThisSessionIdentifier(void) +{ + return getThisSessionID(); +} + +static sqInt +halt(void) +{ + ; + return 0; +} + +EXPORT(sqInt) +initialiseModule(void) +{ + return 1; +} + + +/* Check for the common failure mode of a SQFile record with all zeros. */ + +static sqInt +isNonNullSQFile(sqInt objectPointer) +{ + unsigned idx; + unsigned char *sqFileBytes; + + sqFileBytes = arrayValueOf(objectPointer); + idx = 0; + while (idx < (fileRecordSize())) { + if ((sqFileBytes[idx]) != 0) { + return 1; + } + idx += 1; + } + return 0; +} + + +/* Check for the common failure mode of a SQSocket record with all zeros. */ + +static sqInt +isNullSQSocket(sqInt objectPointer) +{ + sqInt idx; + unsigned char *sqSocketBytes; + + sqSocketBytes = arrayValueOf(objectPointer); + idx = 0; + while (idx < (socketRecordSize())) { + if ((sqSocketBytes[idx]) != 0) { + return 0; + } + idx += 1; + } + return 1; +} + + +/* Answer true if objectPointer appears to be a valid SQFile ByteArray. + This check is appropriate if objectPointer has been passed as a parameter + to a primitive, and is expected to represent a valid file reference. */ + +static sqInt +isSQFileObject(sqInt objectPointer) +{ + return (((isBytes(objectPointer)) + && ((byteSizeOf(objectPointer)) == (fileRecordSize()))) + && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(objectPointer))))) + && (isNonNullSQFile(objectPointer)); +} + + +/* Answer true if objectPointer appears to be a valid SQSocket ByteArray. + This check + is appropriate if objectPointer has been passed as a parameter to a + primitive, and + is expected to represent a valid socket reference. + */ + +static sqInt +isSQSocketObject(sqInt objectPointer) +{ + return ((isBytes(objectPointer)) + && ((byteSizeOf(objectPointer)) == (socketRecordSize()))) + && (!(isNullSQSocket(objectPointer))); +} + + +/* Answer true if the file session matches the current interpreter session + identifier. + */ + +static sqInt +isValidFileSession(sqInt objectPointer) +{ + return (getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(objectPointer))); +} + + +/* The module with the given name was just unloaded. + Make sure we have no dangling references. */ + +EXPORT(sqInt) +moduleUnloaded(char *aModuleName) +{ +} + +static sqInt +msg(char *s) +{ + fprintf(stderr, "\n%s: %s", moduleName, s); + return 0; +} + + +/* Definitively disable asynchronous event notification for a descriptor. The + parameter is an OS level integer file descriptor. */ + +EXPORT(sqInt) +primitiveAioDisable(void) +{ + sqInt fd; + + if ((nilObject()) == (stackValue(0))) { + return primitiveFail(); + } + fd = stackIntegerValue(0); + if (fd < 0) { + return primitiveFail(); + } + aioDisable(fd); + pop(2); + pushInteger(fd); +} + + +/* Enable asynchronous notification for a descriptor. The first parameter is + an OS + level integer file descriptor. The second parameter is the index of a + Semaphore to + be notified, and the third parameter is a flag indicating that descriptor + represents an external object and should not be closed on termination of + aio handling. Answer + the semaphore index. + */ + +EXPORT(sqInt) +primitiveAioEnable(void) +{ + static int eventSemaphoreIndices[FD_SETSIZE]; + sqInt externalObject; + sqInt fd; + sqInt flags; + sqInt semaIndex; + + if ((nilObject()) == (stackValue(2))) { + return primitiveFail(); + } + fd = stackIntegerValue(2); + if (fd < 0) { + return primitiveFail(); + } + semaIndex = stackIntegerValue(1); + eventSemaphoreIndices[semaIndex] = semaIndex; + externalObject = stackObjectValue(0); + if (externalObject == (trueObject())) { + flags = AIO_EXT; + } + else { + flags = 0; + } + aioEnable(fd, &(eventSemaphoreIndices[semaIndex]), flags); + pop(4); + pushInteger(semaIndex); +} + + +/* Handle asynchronous event notification for a descriptor. The first + parameter is + an OS level integer file descriptor. The remaining three parameters are + Boolean flags representing the types of events for which notification is + being requested: + handle exceptions, handle for read, and handle for write. + Flags are defined in the aio.h source as: + AIO_X (1<<0) handle for exceptions + AIO_R (1<<1) handle for read + AIO_W (1<<2) handle for write */ + +EXPORT(sqInt) +primitiveAioHandle(void) +{ + sqInt exceptionWatch; + sqInt fd; + sqInt flags; + sqInt readWatch; + sqInt writeWatch; + + if ((nilObject()) == (stackValue(3))) { + return primitiveFail(); + } + fd = stackIntegerValue(3); + if (fd < 0) { + return primitiveFail(); + } + exceptionWatch = stackObjectValue(2); + readWatch = stackObjectValue(1); + writeWatch = stackObjectValue(0); + flags = 0; + if (exceptionWatch == (trueObject())) { + flags = flags | (AIO_X); + } + if (readWatch == (trueObject())) { + flags = flags | (AIO_R); + } + if (writeWatch == (trueObject())) { + flags = flags | (AIO_W); + } + aioHandle(fd, aioForwardwithDataandFlags, flags); + pop(5); + pushInteger(flags); +} + + +/* Temporarily suspend asynchronous event notification for a descriptor. The + first parameter is an OS level integer file descriptor. The remaining + three parameters + are Boolean flags representing the types of events for which notification + is being + requested: handle exceptions, handle for read, and handle for write. + Flags are defined in the aio.h source as: + AIO_X (1<<0) handle for exceptions + AIO_R (1<<1) handle for read + AIO_W (1<<2) handle for write */ + +EXPORT(sqInt) +primitiveAioSuspend(void) +{ + sqInt exceptionWatch; + sqInt fd; + sqInt flags; + sqInt readWatch; + sqInt writeWatch; + + if ((nilObject()) == (stackValue(3))) { + return primitiveFail(); + } + fd = stackIntegerValue(3); + if (fd < 0) { + return primitiveFail(); + } + exceptionWatch = stackObjectValue(2); + readWatch = stackObjectValue(1); + writeWatch = stackObjectValue(0); + flags = 0; + if (exceptionWatch == (trueObject())) { + flags = flags | (AIO_X); + } + if (readWatch == (trueObject())) { + flags = flags | (AIO_R); + } + if (writeWatch == (trueObject())) { + flags = flags | (AIO_W); + } + aioSuspend(fd, flags); + pop(5); + pushInteger(flags); +} + + +/* Answer a string containing the module name string for this plugin. */ + +EXPORT(sqInt) +primitiveModuleName(void) +{ + popthenPush(1, stringFromCString(getModuleName())); +} + + +/* Take a struct SQFile from the stack, and answer the value of its Unix file + number. + */ + +EXPORT(sqInt) +primitiveOSFileHandle(void) +{ + sqInt fileNo; + sqInt sqFileOop; + + sqFileOop = stackValue(0); + if (!((((isBytes(sqFileOop)) + && ((byteSizeOf(sqFileOop)) == (fileRecordSize()))) + && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(sqFileOop))))) + && (isNonNullSQFile(sqFileOop)))) { + return primitiveFail(); + } + /* begin fileDescriptorFrom: */ + if (!((((isBytes(sqFileOop)) + && ((byteSizeOf(sqFileOop)) == (fileRecordSize()))) + && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(sqFileOop))))) + && (isNonNullSQFile(sqFileOop)))) { + fileNo = -1; + goto l1; + } + fileNo = fileno(fileHandleFrom(sqFileOop)); +l1: /* end fileDescriptorFrom: */; + pop(2); + pushInteger(fileNo); +} + + +/* Take a struct SQSocket from the stack, and answer the value of its Unix + file number. + */ + +EXPORT(sqInt) +primitiveOSSocketHandle(void) +{ + int fileNo; + sqInt sqSocketOop; + + sqSocketOop = stackValue(0); + if (!(((isBytes(sqSocketOop)) + && ((byteSizeOf(sqSocketOop)) == (socketRecordSize()))) + && (!(isNullSQSocket(sqSocketOop))))) { + return primitiveFail(); + } + fileNo = socketDescriptorFrom(sqSocketOop); + if (fileNo < 0) { + return primitiveFail(); + } + pop(2); + pushInteger(fileNo); +} + + +/* Answer a string containing the version string for this plugin. */ + +EXPORT(sqInt) +primitiveVersionString(void) +{ + popthenPush(1, stringFromCString(versionString())); +} + + +/* Answer the session identifier from a SQFile structure. For a valid file + reference, this identifier will match the session identifier supplied by @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.907.mcz
by commits＠source.squeak.org 22 Oct '14

22 Oct '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.907.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.907 Author: eem Time: 21 October 2014, 7:05:00.842 pm UUID: 1d1ad3df-9d81-4278-95fd-a11857f7a60d Ancestors: VMMaker.oscog-eem.906 Eliminate some translation-time warnings =============== Diff against VMMaker.oscog-eem.906 =============== Item was changed: ----- Method: CogObjectRepresentation>>maybeMarkCounters: (in category 'sista support') ----- maybeMarkCounters: theCounters "In SIsta Spur counters are held on the heap in pinned objects which must be marked to avoid them being garbage collected. This is the hook through which that happens. By default, do nothing." + <var: #theCounters type: #usqInt> - <var: #counters type: #usqInt> <inline: true>! Item was changed: ----- Method: Cogit class>>declareCVarsIn: (in category 'translation') ----- declareCVarsIn: aCCodeGenerator #( 'coInterpreter' 'objectMemory' 'methodZone' 'objectRepresentation' 'cogBlockMethodSurrogateClass' 'cogMethodSurrogateClass' 'threadManager' 'processor' 'lastNInstructions' 'simulatedAddresses' 'simulatedTrampolines' 'simulatedVariableGetters' 'simulatedVariableSetters' 'printRegisters' 'printInstructions' 'clickConfirm' 'singleStep') do: [:simulationVariableNotNeededForRealVM| aCCodeGenerator removeVariable: simulationVariableNotNeededForRealVM]. NewspeakVM ifFalse: [#( 'dynSuperEntry' 'dynSuperEntryAlignment' 'dynamicSuperSendTrampolines' + 'ceImplicitReceiverTrampoline' 'ceEnclosingObjectTrampoline' 'cmDynSuperEntryOffset' - 'ceImplicitReceiverTrampoline' 'ceExplicitReceiverTrampoline' 'cmDynSuperEntryOffset' 'numIRCs' 'indexOfIRC' 'theIRCs') do: [:variableNotNeededInNormalVM| aCCodeGenerator removeVariable: variableNotNeededInNormalVM]]. aCCodeGenerator removeConstant: #COGMTVM. "this should be defined at compile time" aCCodeGenerator addHeaderFile:'<stddef.h>'; "for e.g. offsetof" addHeaderFile:'"sqCogStackAlignment.h"'; addHeaderFile:'"cogmethod.h"'; addHeaderFile:'#if COGMTVM'; addHeaderFile:'"cointerpmt.h"'; addHeaderFile:'#else'; addHeaderFile:'"cointerp.h"'; addHeaderFile:'#endif'; addHeaderFile:'"cogit.h"'; addHeaderFile:'"dispdbg.h"'. aCCodeGenerator var: #ceGetSP declareC: 'unsigned long (*ceGetSP)(void)'; var: #ceCaptureCStackPointers declareC: 'void (*ceCaptureCStackPointers)(void)'; var: #ceEnterCogCodePopReceiverReg declareC: 'void (*ceEnterCogCodePopReceiverReg)(void)'; var: #realCEEnterCogCodePopReceiverReg declareC: 'void (*realCEEnterCogCodePopReceiverReg)(void)'; var: #ceCallCogCodePopReceiverReg declareC: 'void (*ceCallCogCodePopReceiverReg)(void)'; var: #realCECallCogCodePopReceiverReg declareC: 'void (*realCECallCogCodePopReceiverReg)(void)'; var: #ceCallCogCodePopReceiverAndClassRegs declareC: 'void (*ceCallCogCodePopReceiverAndClassRegs)(void)'; var: #realCECallCogCodePopReceiverAndClassRegs declareC: 'void (*realCECallCogCodePopReceiverAndClassRegs)(void)'; var: #ceFlushICache declareC: 'static void (*ceFlushICache)(unsigned long from, unsigned long to)'; var: #ceCheckFeaturesFunction declareC: 'static unsigned long (*ceCheckFeaturesFunction)(void)'; var: #ceTryLockVMOwner declareC: 'unsigned long (*ceTryLockVMOwner)(void)'; var: #ceUnlockVMOwner declareC: 'void (*ceUnlockVMOwner)(void)'; var: #postCompileHook declareC: 'void (*postCompileHook)(CogMethod *, void *)'; var: #openPICList declareC: 'CogMethod *openPICList = 0'; var: #maxMethodBefore type: #'CogBlockMethod *'. aCCodeGenerator declareVar: 'aMethodLabel' type: #'AbstractInstruction'; "Has to come lexicographically before backEnd & methodLabel" var: #backEnd declareC: 'AbstractInstruction * const backEnd = &aMethodLabel'; var: #methodLabel declareC: 'AbstractInstruction * const methodLabel = &aMethodLabel'; var: #primInvokeLabel type: #'AbstractInstruction *'. self declareC: #(abstractOpcodes stackCheckLabel blockEntryLabel blockEntryNoContextSwitch stackOverflowCall sendMiss sendMissCall entry noCheckEntry dynSuperEntry mnuCall interpretCall interpretLabel endCPICCase0 endCPICCase1) as: #'AbstractInstruction *' in: aCCodeGenerator. aCCodeGenerator declareVar: #annotations type: #'InstructionAnnotation *'; declareVar: #blockStarts type: #'BlockStart *'; declareVar: #fixups type: #'BytecodeFixup *'. aCCodeGenerator var: #sendTrampolines declareC: 'sqInt sendTrampolines[NumSendTrampolines]'; var: #superSendTrampolines declareC: 'sqInt superSendTrampolines[NumSendTrampolines]'; var: #dynamicSuperSendTrampolines declareC: 'sqInt dynamicSuperSendTrampolines[NumSendTrampolines]'; var: #trampolineAddresses declareC: 'static char *trampolineAddresses[NumTrampolines*2]'; var: #objectReferencesInRuntime declareC: 'static sqInt objectReferencesInRuntime[NumObjRefsInRuntime]'; var: #labelCounter type: #int; var: #traceFlags declareC: 'int traceFlags = 8 /* prim trace log on by default */'; var: #cStackAlignment declareC: 'const int cStackAlignment = STACK_ALIGN_BYTES'. aCCodeGenerator declareVar: #CFramePointer type: #'void *'; declareVar: #CStackPointer type: #'void *'; declareVar: #minValidCallAddress type: #'unsigned long'; declareVar: #debugPrimCallStackOffset type: #'unsigned long'. aCCodeGenerator vmClass generatorTable ifNotNil: [:bytecodeGenTable| aCCodeGenerator var: #generatorTable declareC: 'static BytecodeDescriptor generatorTable[', bytecodeGenTable size, ']', (self tableInitializerFor: bytecodeGenTable in: aCCodeGenerator); var: #primitiveGeneratorTable declareC: 'static PrimitiveDescriptor primitiveGeneratorTable[MaxCompiledPrimitiveIndex+1]', (self tableInitializerFor: aCCodeGenerator vmClass primitiveTable in: aCCodeGenerator)]. "In C the abstract opcode names clash with the Smalltak generator syntactic sugar. Most of the syntactic sugar is inlined, but alas some remains. Rename the syntactic sugar to avoid the clash." (self organization listAtCategoryNamed: #'abstract instructions') do: [:s| aCCodeGenerator addSelectorTranslation: s to: 'g', (aCCodeGenerator cFunctionNameFor: s)]. aCCodeGenerator addSelectorTranslation: #halt: to: 'haltmsg'! Item was changed: ----- Method: NewsqueakIA32ABIPlugin>>primMalloc (in category 'primitives-memory management') ----- primMalloc "Malloc arg bytes." "primMalloc: byteSize <Integer> <^Integer> <primitive: 'primMalloc' error: errorCode module: 'IA32ABI'>" | byteSize addr | <export: true> - <var: #ptr type: 'long *'> <var: #byteSize type: 'long'> byteSize := interpreterProxy stackIntegerValue: 0. (interpreterProxy failed or: [byteSize <= 0 "some mallocs can't deal with malloc(0) bytes"]) ifTrue: [^interpreterProxy primitiveFailFor: PrimErrBadArgument]. addr := self cCode: [self malloc: byteSize] inSmalltalk: [Alien Cmalloc: byteSize]. addr = 0 ifTrue: [^interpreterProxy primitiveFailFor: PrimErrNoCMemory]. interpreterProxy methodReturnValue: (interpreterProxy positive32BitIntegerFor: addr asUnsignedInteger)!

1 0

VM Maker: VMMaker.oscog-eem.906.mcz
by commits＠source.squeak.org 22 Oct '14

22 Oct '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.906.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.906 Author: eem Time: 21 October 2014, 6:20:00.635 pm UUID: aaa9ffc5-3dc3-455d-b550-92988ab90a8d Ancestors: VMMaker.oscog-eem.905 Spur: Implement image segments. Use Igor's idea of splitting the computation of the transitive closure from the writing of the image segment for simplicity, even if the two are rolled together into a single primitive for backwards-compatibility. Status is that raw use of the primtiives works, but use in the context of ImageSegmentTest fails apparently because something somewhere changes the version stamp at teh start of a segment. Any clues appreciated. Rename markAccessibleObjects to markAccessibleObjectsAndFireEphemerons, rename markObjects to markObjects: flag, where flag is true if objects are known to be unmarked before hand. Move expungeDuplicateAndUnmarkedClasses: and nilUnmarkedWeaklingSlots into markObjects: from globalGarbageCollect. This is all to ensure that the mark phase of the storeImageSegment prim does process weaklings fully before computing the transitive closure. Extend the object shortening code to include word objects (for the image segment arrays) and make them deal with new space objects as well as old space objects. Have freeObject: attempt to coalesce to avoid fragmenting the largest free chunk all the time it is used for scratch storage). Nuke the abortive attempt to implement the Spur image segment code similarly to the V3 code. Simplify isHiddenObj: for leak checking to tolerate more punned scratch objects in new space. Add a flag to checkForLeaks to specifically check for leaks around the segment prims. Change readableFormat: so that on Spur there is as yet no acceptable compatibility version. All: Rewrite the two primitives to pass back an error code on failure, and rewrite the (New)ObjectMemory code to answer informative failure codes. Make findClassContainingMethod:startingAt: et al robust in the face of faulted-out classes (nil method dictionaries). =============== Diff against VMMaker.oscog-eem.905 =============== Item was changed: ----- Method: InterpreterPrimitives>>primitiveLoadImageSegment (in category 'image segment in/out') ----- primitiveLoadImageSegment "This primitive is called from Squeak as... <imageSegment> loadSegmentFrom: aWordArray outPointers: anArray." "This primitive will load a binary image segment created by primitiveStoreImageSegment. It expects the outPointer array to be of the proper size, and the wordArray to be well formed. It will return as its value the original array of roots, and the erstwhile segmentWordArray will have been truncated to a size of zero. If this primitive should fail, the segmentWordArray will, sadly, have been reduced to an unrecognizable and unusable jumble. But what more could you have done with it anyway?" | outPointerArray segmentWordArray result | outPointerArray := self stackTop. segmentWordArray := self stackValue: 1. "Essential type checks" ((objectMemory isArray: outPointerArray) "Must be indexable pointers" and: [objectMemory isWords: segmentWordArray]) "Must be indexable words" ifFalse: [^self primitiveFail]. + "the engine returns the roots array which was first in the segment, or an error code on failure." - "the engine returns the roots array which was first in the segment, or 0 on failure" result := objectMemory loadImageSegmentFrom: segmentWordArray outPointers: outPointerArray. + (self oop: result isGreaterThan: segmentWordArray) + ifTrue: [self pop: 3 thenPush: result] + ifFalse: [self primitiveFailFor: result]! - result = 0 - ifTrue: [self primitiveFail] - ifFalse: [self pop: 3 thenPush: result]! Item was changed: ----- Method: NewObjectMemory>>loadImageSegmentFrom:outPointers: (in category 'image segment in/out') ----- loadImageSegmentFrom: segmentWordArray outPointers: outPointerArray "This primitive is called from Squeak as... <imageSegment> loadSegmentFrom: aWordArray outPointers: anArray." "This primitive will load a binary image segment created by primitiveStoreImageSegment. It expects the outPointer array to be of the proper size, and the wordArray to be well formed. It will return as its value the original array of roots, and the erstwhile segmentWordArray will have been truncated to a size of zero. If this primitive should fail, the segmentWordArray will, sadly, have been reduced to an unrecognizable and unusable jumble. But what more could you have done with it anyway?" | endSeg segOop fieldPtr fieldOop doingClass lastPtr extraSize mapOop lastOut outPtr hdrTypeBits header data | <inline: false> <var: #endSeg type: #usqInt> <var: #segOop type: #usqInt> <var: #fieldPtr type: #usqInt> <var: #lastOut type: #usqInt> <var: #outPtr type: #usqInt> <var: #lastPtr type: #usqInt> DoAssertionChecks ifTrue: [self verifyCleanHeaders]. lastOut := outPointerArray + (self lastPointerOf: outPointerArray). endSeg := segmentWordArray + (self sizeBitsOf: segmentWordArray) - BaseHeaderSize. "Version check. Byte order of the WordArray now" data := self longAt: segmentWordArray + BaseHeaderSize. (coInterpreter readableFormat: (data bitAnd: 16rFFFF "low 2 bytes")) ifFalse: "Not readable -- try again with reversed bytes..." [self reverseBytesFrom: segmentWordArray + BaseHeaderSize to: endSeg + BytesPerWord. data := self longAt: segmentWordArray + BaseHeaderSize. (coInterpreter readableFormat: (data bitAnd: 16rFFFF "low 2 bytes")) ifFalse: "Still NG -- put things back and fail" [self reverseBytesFrom: segmentWordArray + BaseHeaderSize to: endSeg + BytesPerWord. DoAssertionChecks ifTrue: [self verifyCleanHeaders]. + ^PrimErrBadArgument]]. - ^0]]. "Reverse the Byte type objects if the data is from opposite endian machine. Revese the words in Floats if from an earlier version with different Float order. Test top byte. $d on the Mac or $s on the PC. Rest of word is equal." (data >> 16) = (self imageSegmentVersion >> 16) ifTrue: "Need to swap floats if the segment is being loaded into a little-endian VM from a version that keeps Floats in big-endian word order as was the case prior to the 6505 image format." [(self isPlatformFloatOrderVersion: (data bitAnd: 16rFFFF "low 2 bytes")) ifFalse: [self vmEndianness ~= 1 "~= 1 => little-endian" ifTrue: [segOop := self oopFromChunk: segmentWordArray + BaseHeaderSize + BytesPerWord. self wordSwapFloatsFrom: segOop to: endSeg + BytesPerWord]]] ifFalse: "Reverse the byte-type objects once" [segOop := self oopFromChunk: segmentWordArray + BaseHeaderSize + BytesPerWord. "Oop of first embedded object" self byteSwapByteObjectsFrom: segOop to: endSeg + BytesPerWord flipFloatsIf: (self isPlatformFloatOrderVersion: (data bitAnd: 16rFFFF "low 2 bytes"))]. "Proceed through the segment, remapping pointers..." segOop := self oopFromChunk: segmentWordArray + BaseHeaderSize + BytesPerWord. [segOop <= endSeg] whileTrue: [(self headerType: segOop) <= 1 ifTrue: ["This object has a class field (type = 0 or 1) -- start with that." fieldPtr := segOop - BytesPerWord. doingClass := true] ifFalse: ["No class field -- start with first data field" fieldPtr := segOop + BaseHeaderSize. doingClass := false]. lastPtr := segOop + (self lastPointerOf: segOop). "last field" lastPtr > endSeg ifTrue: [DoAssertionChecks ifTrue: [self verifyCleanHeaders]. + ^PrimErrBadIndex "out of bounds"]. - ^0 "out of bounds"]. "Go through all oops, remapping them..." [fieldPtr > lastPtr] whileFalse: ["Examine each pointer field" fieldOop := self longAt: fieldPtr. doingClass ifTrue: [hdrTypeBits := self headerType: fieldPtr. fieldOop := fieldOop - hdrTypeBits]. (self isIntegerObject: fieldOop) ifTrue: ["Integer -- nothing to do" fieldPtr := fieldPtr + BytesPerWord] ifFalse: [(fieldOop bitAnd: 3) = 0 ifFalse: + [^PrimErrBadIndex "bad oop"]. - [^0 "bad oop"]. (fieldOop bitAnd: 16r80000000) = 0 ifTrue: ["Internal pointer -- add segment offset" mapOop := fieldOop + segmentWordArray] ifFalse: ["External pointer -- look it up in outPointers" outPtr := outPointerArray + (fieldOop bitAnd: 16r7FFFFFFF). outPtr > lastOut ifTrue: + [^PrimErrBadIndex "out of bounds"]. - [^0 "out of bounds"]. mapOop := self longAt: outPtr]. doingClass ifTrue: [self longAt: fieldPtr put: mapOop + hdrTypeBits. fieldPtr := fieldPtr + 8. doingClass := false] ifFalse: [self longAt: fieldPtr put: mapOop. fieldPtr := fieldPtr + BytesPerWord]. segOop < youngStart ifTrue: [self possibleRootStoreInto: segOop value: mapOop]]]. segOop := self objectAfter: segOop]. "Again, proceed through the segment checking consistency..." segOop := self oopFromChunk: segmentWordArray + BaseHeaderSize + BytesPerWord. [segOop <= endSeg] whileTrue: [(self oopHasAcceptableClass: segOop) ifFalse: + [^PrimErrInappropriate "inconsistency"]. - [^0 "inconsistency"]. fieldPtr := segOop + BaseHeaderSize. "first field" lastPtr := segOop + (self lastPointerOf: segOop). "last field" "Go through all oops, remapping them..." [fieldPtr > lastPtr] whileFalse: ["Examine each pointer field" fieldOop := self longAt: fieldPtr. (self oopHasAcceptableClass: fieldOop) ifFalse: + [^PrimErrInappropriate "inconsistency"]. - [^0 "inconsistency"]. fieldPtr := fieldPtr + BytesPerWord]. segOop := self objectAfter: segOop]. "Truncate the segment word array to size = BytesPerWord (vers stamp only)" extraSize := self extraHeaderBytes: segmentWordArray. hdrTypeBits := self headerType: segmentWordArray. extraSize = 8 ifTrue: [self longAt: segmentWordArray-extraSize put: BaseHeaderSize + BytesPerWord + hdrTypeBits] ifFalse: [header := self longAt: segmentWordArray. self longAt: segmentWordArray put: header - (header bitAnd: SizeMask) + BaseHeaderSize + BytesPerWord]. "and return the roots array which was first in the segment" DoAssertionChecks ifTrue: [self verifyCleanHeaders]. ^self oopFromChunk: segmentWordArray + BaseHeaderSize + BytesPerWord! Item was changed: ----- Method: ObjectMemory>>loadImageSegmentFrom:outPointers: (in category 'image segment in/out') ----- loadImageSegmentFrom: segmentWordArray outPointers: outPointerArray "This primitive is called from Squeak as... <imageSegment> loadSegmentFrom: aWordArray outPointers: anArray." "This primitive will load a binary image segment created by primitiveStoreImageSegment. It expects the outPointer array to be of the proper size, and the wordArray to be well formed. It will return as its value the original array of roots, and the erstwhile segmentWordArray will have been truncated to a size of zero. If this primitive should fail, the segmentWordArray will, sadly, have been reduced to an unrecognizable and unusable jumble. But what more could you have done with it anyway?" | endSeg segOop fieldPtr fieldOop doingClass lastPtr extraSize mapOop lastOut outPtr hdrTypeBits header data | <inline: false> <var: #endSeg type: #usqInt> <var: #segOop type: #usqInt> <var: #fieldPtr type: #usqInt> <var: #lastOut type: #usqInt> <var: #outPtr type: #usqInt> <var: #lastPtr type: #usqInt> DoAssertionChecks ifTrue: [self verifyCleanHeaders]. lastOut := outPointerArray + (self lastPointerOf: outPointerArray). endSeg := segmentWordArray + (self sizeBitsOf: segmentWordArray) - BaseHeaderSize. "Version check. Byte order of the WordArray now" data := self longAt: segmentWordArray + BaseHeaderSize. (self readableFormat: (data bitAnd: 16rFFFF "low 2 bytes")) ifFalse: "Not readable -- try again with reversed bytes..." [self reverseBytesFrom: segmentWordArray + BaseHeaderSize to: endSeg + BytesPerWord. data := self longAt: segmentWordArray + BaseHeaderSize. (self readableFormat: (data bitAnd: 16rFFFF "low 2 bytes")) ifFalse: "Still NG -- put things back and fail" [self reverseBytesFrom: segmentWordArray + BaseHeaderSize to: endSeg + BytesPerWord. DoAssertionChecks ifTrue: [self verifyCleanHeaders]. + ^PrimErrBadArgument]]. - ^0]]. "Reverse the Byte type objects if the data is from opposite endian machine. Test top byte. $d on the Mac or $s on the PC. Rest of word is equal." (data >> 16) = (self imageSegmentVersion >> 16) ifFalse: "Reverse the byte-type objects once" [segOop := self oopFromChunk: segmentWordArray + BaseHeaderSize + BytesPerWord. "Oop of first embedded object" self byteSwapByteObjectsFrom: segOop to: endSeg + BytesPerWord flipFloatsIf: false]. "Proceed through the segment, remapping pointers..." segOop := self oopFromChunk: segmentWordArray + BaseHeaderSize + BytesPerWord. [segOop <= endSeg] whileTrue: [(self headerType: segOop) <= 1 ifTrue: ["This object has a class field (type = 0 or 1) -- start with that." fieldPtr := segOop - BytesPerWord. doingClass := true] ifFalse: ["No class field -- start with first data field" fieldPtr := segOop + BaseHeaderSize. doingClass := false]. lastPtr := segOop + (self lastPointerOf: segOop). "last field" lastPtr > endSeg ifTrue: [DoAssertionChecks ifTrue: [self verifyCleanHeaders]. + ^PrimErrBadIndex "out of bounds"]. - ^0 "out of bounds"]. "Go through all oops, remapping them..." [fieldPtr > lastPtr] whileFalse: ["Examine each pointer field" fieldOop := self longAt: fieldPtr. doingClass ifTrue: [hdrTypeBits := self headerType: fieldPtr. fieldOop := fieldOop - hdrTypeBits]. (self isIntegerObject: fieldOop) ifTrue: ["Integer -- nothing to do" fieldPtr := fieldPtr + BytesPerWord] ifFalse: [(fieldOop bitAnd: 3) = 0 ifFalse: + [^PrimErrBadIndex "bad oop"]. - [^0 "bad oop"]. (fieldOop bitAnd: 16r80000000) = 0 ifTrue: ["Internal pointer -- add segment offset" mapOop := fieldOop + segmentWordArray] ifFalse: ["External pointer -- look it up in outPointers" outPtr := outPointerArray + (fieldOop bitAnd: 16r7FFFFFFF). outPtr > lastOut ifTrue: + [^PrimErrBadIndex "out of bounds"]. - [^0 "out of bounds"]. mapOop := self longAt: outPtr]. doingClass ifTrue: [self longAt: fieldPtr put: mapOop + hdrTypeBits. fieldPtr := fieldPtr + 8. doingClass := false] ifFalse: [self longAt: fieldPtr put: mapOop. fieldPtr := fieldPtr + BytesPerWord]. segOop < youngStart ifTrue: [self possibleRootStoreInto: segOop value: mapOop]]]. segOop := self objectAfter: segOop]. "Again, proceed through the segment checking consistency..." segOop := self oopFromChunk: segmentWordArray + BaseHeaderSize + BytesPerWord. [segOop <= endSeg] whileTrue: [(self oopHasAcceptableClass: segOop) ifFalse: + [^PrimErrInappropriate "inconsistency"]. - [^0 "inconsistency"]. fieldPtr := segOop + BaseHeaderSize. "first field" lastPtr := segOop + (self lastPointerOf: segOop). "last field" "Go through all oops, remapping them..." [fieldPtr > lastPtr] whileFalse: ["Examine each pointer field" fieldOop := self longAt: fieldPtr. (self oopHasAcceptableClass: fieldOop) ifFalse: + [^PrimErrInappropriate "inconsistency"]. - [^0 "inconsistency"]. fieldPtr := fieldPtr + BytesPerWord]. segOop := self objectAfter: segOop]. "Truncate the segment word array to size = BytesPerWord (vers stamp only)" extraSize := self extraHeaderBytes: segmentWordArray. hdrTypeBits := self headerType: segmentWordArray. extraSize = 8 ifTrue: [self longAt: segmentWordArray-extraSize put: BaseHeaderSize + BytesPerWord + hdrTypeBits] ifFalse: [header := self longAt: segmentWordArray. self longAt: segmentWordArray put: header - (header bitAnd: SizeMask) + BaseHeaderSize + BytesPerWord]. "and return the roots array which was first in the segment" DoAssertionChecks ifTrue: [self verifyCleanHeaders]. ^self oopFromChunk: segmentWordArray + BaseHeaderSize + BytesPerWord! Item was added: + ----- Method: Spur32BitMMLESimulator>>loadImageSegmentFrom:outPointers: (in category 'image segment in/out') ----- + loadImageSegmentFrom: segmentWordArray outPointers: outPointerArray + self halt. + ^super loadImageSegmentFrom: segmentWordArray outPointers: outPointerArray! Item was added: + ----- Method: Spur32BitMMLESimulator>>newOutPointer:at:in:hashes:topHashBit: (in category 'object access') ----- + newOutPointer: oop at: outIndex in: outPointerArray hashes: savedOutHashes topHashBit: topHashBit + self halt. + ^super newOutPointer: oop at: outIndex in: outPointerArray hashes: savedOutHashes topHashBit: topHashBit! Item was added: + ----- Method: Spur32BitMemoryManager>>numSlotsForShortening:toIndexableSize: (in category 'allocation') ----- + numSlotsForShortening: objOop toIndexableSize: indexableSize + <inline: true> + ^(self formatOf: objOop) caseOf: + { [self arrayFormat] -> [indexableSize]. + [self firstLongFormat] -> [self numSlotsForBytes: indexableSize * 4] }! Item was added: + ----- Method: Spur64BitMemoryManager>>numSlotsForShortening:toIndexableSize: (in category 'allocation') ----- + numSlotsForShortening: objOop toIndexableSize: indexableSize + <inline: true> + ^(self formatOf: objOop) caseOf: + { [self arrayFormat] -> [indexableSize]. + [self firstLongFormat] -> [self numSlotsForBytes: indexableSize * 4]. + [self firstLongFormat + 1] -> [self numSlotsForBytes: indexableSize * 4] }! Item was added: + ----- Method: SpurGenerationScavenger>>forgetObject: (in category 'gc - global') ----- + forgetObject: objOop + "Forget the argument." + self assert: rememberedSetSize > 0. + self assert: (manager isRemembered: objOop). + manager setIsRememberedOf: objOop to: false. + objOop = (rememberedSet at: rememberedSetSize - 1) ifFalse: + [| index | + index := 0. + [index < rememberedSetSize] whileTrue: + [objOop = (rememberedSet at: index) ifTrue: + [rememberedSet at: index put: (rememberedSet at: rememberedSetSize - 1). + index := rememberedSetSize]]]. + rememberedSetSize := rememberedSetSize - 1. + self assert: rememberedSetSize >= 0! Item was changed: ----- Method: SpurMemoryManager>>allInstancesOf: (in category 'primitive support') ----- allInstancesOf: aClass "Attempt to answer an array of all objects, excluding those that may be garbage collected as a side effect of allocating the result array. If no memory is available answer the number of instances as a SmallInteger. Since objects are at least 16 bytes big, and the largest SmallInteger covers 1/4 of the address space, the count can never overflow." | classIndex freeChunk ptr start limit count bytes | classIndex := self rawHashBitsOf: aClass. classIndex = 0 ifTrue: [freeChunk := self allocateSlots: 0 format: self arrayFormat classIndex: ClassArrayCompactIndex. ^freeChunk]. MarkObjectsForEnumerationPrimitives ifTrue: + [self markObjects: true]. "may not want to revive objects unnecessarily; but marking is sloooow." - [self markObjects]. "may not want to revive objects unnecessarily; but marking is sloooow." freeChunk := self allocateLargestFreeChunk. start := freeChunk + self baseHeaderSize. limit := self addressAfter: freeChunk. (self isClassAtUniqueIndex: aClass) ifTrue: [self uniqueIndex: classIndex allInstancesInto: start limit: limit resultsInto: [:c :p| count := c. ptr := p]] ifFalse: [self ambiguousClass: aClass allInstancesInto: start limit: limit resultsInto: [:c :p| count := c. ptr := p]]. self assert: (self isEmptyObjStack: markStack). MarkObjectsForEnumerationPrimitives ifTrue: [self assert: self allObjectsUnmarked. self emptyObjStack: weaklingStack] ifFalse: [self assert: (self isEmptyObjStack: weaklingStack)]. (count > (ptr - start / self bytesPerSlot) "not enough room" or: [limit ~= ptr and: [limit - ptr <= self allocationUnit]]) ifTrue: "can't split a single word" [self freeObject: freeChunk. ^self integerObjectOf: count]. count < self numSlotsMask ifTrue: [| smallObj | smallObj := self allocateSlots: count format: self arrayFormat classIndex: ClassArrayCompactIndex. 0 to: count - 1 do: [:i| self storePointerUnchecked: i ofObject: smallObj withValue: (self fetchPointer: i ofFreeChunk: freeChunk)]. self freeChunkWithBytes: (self bytesInObject: freeChunk) at: (self startOfObject: freeChunk). self beRootIfOld: smallObj. self checkFreeSpace. ^smallObj]. bytes := self largeObjectBytesForSlots: count. start := self startOfObject: freeChunk. self freeChunkWithBytes: limit - start - bytes at: start + bytes. totalFreeOldSpace := totalFreeOldSpace - bytes. self setOverflowNumSlotsOf: freeChunk to: count. self set: freeChunk classIndexTo: ClassArrayCompactIndex formatTo: self arrayFormat. self possibleRootStoreInto: freeChunk. self checkFreeSpace. self runLeakCheckerForFullGC: false. ^freeChunk ! Item was changed: ----- Method: SpurMemoryManager>>allObjects (in category 'primitive support') ----- allObjects "Attempt to answer an array of all objects, excluding those that may be garbage collected as a side effect of allocating the result array. If no memory is available answer the number of objects as a SmallInteger. Since objects are at least 16 bytes big, and the largest SmallInteger covers 1/4 of the address space, the count can never overflow." | freeChunk ptr start limit count bytes | MarkObjectsForEnumerationPrimitives ifTrue: + [self markObjects: true]. "may not want to revive objects unnecessarily; but marking is sloooow." - [self markObjects]. "may not want to revive objects unnecessarily; but marking is sloooow." freeChunk := self allocateLargestFreeChunk. ptr := start := freeChunk + self baseHeaderSize. limit := self addressAfter: freeChunk. count := 0. self allHeapEntitiesDo: [:obj| "continue enumerating even if no room so as to unmark all objects." (MarkObjectsForEnumerationPrimitives ifTrue: [self isMarked: obj] ifFalse: [true]) ifTrue: [(self isNormalObject: obj) ifTrue: [MarkObjectsForEnumerationPrimitives ifTrue: [self setIsMarkedOf: obj to: false]. count := count + 1. ptr < limit ifTrue: [self longAt: ptr put: obj. ptr := ptr + self bytesPerSlot]] ifFalse: [MarkObjectsForEnumerationPrimitives ifTrue: [(self isSegmentBridge: obj) ifFalse: [self setIsMarkedOf: obj to: false]]]]]. self assert: (self isEmptyObjStack: markStack). MarkObjectsForEnumerationPrimitives ifTrue: [self assert: self allObjectsUnmarked. self emptyObjStack: weaklingStack] ifFalse: [self assert: (self isEmptyObjStack: weaklingStack)]. self assert: count >= self numSlotsMask. (count > (ptr - start / self bytesPerSlot) "not enough room" or: [limit ~= ptr and: [limit - ptr <= self allocationUnit]]) ifTrue: "can't split a single word" [self freeChunkWithBytes: (self bytesInObject: freeChunk) at: (self startOfObject: freeChunk). self checkFreeSpace. ^self integerObjectOf: count]. bytes := self largeObjectBytesForSlots: count. start := self startOfObject: freeChunk. self freeChunkWithBytes: limit - start - bytes at: start + bytes. totalFreeOldSpace := totalFreeOldSpace - bytes. self setOverflowNumSlotsOf: freeChunk to: count. self set: freeChunk classIndexTo: ClassArrayCompactIndex formatTo: self arrayFormat. self possibleRootStoreInto: freeChunk. self checkFreeSpace. self runLeakCheckerForFullGC: false. ^freeChunk ! Item was removed: - ----- Method: SpurMemoryManager>>arrayOfUnmarkedClasses (in category 'image segment in/out') ----- - arrayOfUnmarkedClasses - | nClasses classes i | - nClasses := 0. - self classTableEntriesDo: - [:class :ignored| - (self isMarked: class) ifFalse: - [nClasses := nClasses + 1]]. - nClasses = 0 ifTrue: - [^nilObj]. - classes := self allocateSlots: nClasses format: self arrayFormat classIndex: ClassArrayCompactIndex. - classes ifNil: - [^self integerObjectOf: PrimErrNoMemory]. - i := 0. - self classTableEntriesDo: - [:class :ignored| - (self isMarked: class) ifFalse: - [self storePointer: i ofObject: classes withValue: class. - i := i + 1]]. - self assert: nClasses = i. - ^classes! Item was added: + ----- Method: SpurMemoryManager>>copyObj:toAddr:startAt:stopAt: (in category 'image segment in/out') ----- + copyObj: objOop toAddr: segAddr startAt: segStart stopAt: endSeg + "Copy objOop into the segment beginning at segAddr, and forward it to the copy. + If it is a class in the class table, set the copy's hash to 0 for reassignment on load. + Answer the next segmentAddr if successful. Answer an appropriate error code if not" + + "Copy the object..." + | bodySize copy hash newOop | + <inline: false> + bodySize := self bytesInObject: objOop. + (self oop: segAddr + bodySize isGreaterThanOrEqualTo: endSeg) ifTrue: + [^PrimErrWritePastObject]. + self mem: segAddr asVoidPointer cp: (self startOfObject: objOop) asVoidPointer y: bodySize. + copy := self objectStartingAt: segAddr. + + "Clear remembered, mark bits of all headers copied into the segment" + self + setIsRememberedOf: copy to: false; + setIsMarkedOf: copy to: false. + "If the object is a class, zero its identityHash (which is its classIndex). + The class will be assigned a new hash on load." + hash := self rawHashBitsOf: objOop. + (hash > self lastClassIndexPun and: [(self classOrNilAtIndex: hash) = objOop]) ifTrue: + [self setHashBitsOf: copy to: 0]. + + newOop := copy - segStart / self allocationUnit. + newOop > self maxIdentityHash ifTrue: + [^PrimErrLimitExceeded]. + self setHashBitsOf: objOop to: copy - segStart / self allocationUnit. + self setIsMarkedOf: objOop to: true. + + "Answer the new end of segment" + ^segAddr + bodySize! Item was removed: - ----- Method: SpurMemoryManager>>copyObj:toSegment:addr:stopAt:saveOopAt: (in category 'image segment in/out') ----- - copyObj: objOop toSegment: segmentWordArray addr: limitSeg stopAt: stopAddr saveOopAt: oopPtr - "Copy objOop into the segment beginning at limitSeg, and forward it to the copy. - Fail if out of space. Answer the next segmentAddr if successful." - - "Copy the object..." - | bodySize copy | - <inline: false> - bodySize := self bytesInObject: objOop. - (self oop: limitSeg + bodySize isGreaterThanOrEqualTo: stopAddr) ifTrue: - [^0]. "failure" - self mem: limitSeg asVoidPointer cp: (self startOfObject: objOop) asVoidPointer y: bodySize. - copy := self objectStartingAt: limitSeg. - - "Clear remebered pinned and mark bits of all headers copied into the segment" - self - setIsRememberedOf: copy to: false; - setIsPinnedOf: copy to: false; - setIsMarkedOf: copy to: false. - - "Remember the oop for undoing in case of prim failure." - self longAt: oopPtr put: objOop. - self forward: objOop to: copy. - - "Return new end of segment" - ^limitSeg + bodySize! Item was removed: - ----- Method: SpurMemoryManager>>ensureAllMarkBitsAreZero (in category 'gc - incremental') ----- - ensureAllMarkBitsAreZero - "If the incremental collector is running mark bits may be set; stop it and clear them if necessary." - self flag: 'need to implement the inc GC first...'. - self assert: self allObjectsUnmarked! Item was changed: ----- Method: SpurMemoryManager>>freeObject: (in category 'free space') ----- freeObject: objOop + "Free an object in oldSpace. Coalesce if possible to reduce fragmentation." <api> + <inline: false> + | bytes start next | + self assert: (self isInOldSpace: objOop). + (self isRemembered: objOop) ifTrue: + [scavenger forgetObject: objOop]. - | bytes | bytes := self bytesInObject: objOop. + start := self startOfObject: objOop. + next := self objectStartingAt: start + bytes. + (self isFreeObject: next) ifTrue: + [self detachFreeObject: next. + bytes := bytes + (self bytesInObject: next)]. totalFreeOldSpace := totalFreeOldSpace + bytes. + ^self freeChunkWithBytes: bytes at: start! - ^self freeChunkWithBytes: bytes at: (self startOfObject: objOop)! Item was removed: - ----- Method: SpurMemoryManager>>freeSmallObject: (in category 'free space') ----- - freeSmallObject: objOop - "Free a small object. The wrinkle here is that we don't tolerate a zero-slot - count in a free object so that the (self longLongAt: objOop) ~= 0 assert in - isEnumerableObject: isn't triggered." - - | headerNumSlots bytes index | - headerNumSlots := self rawNumSlotsOf: objOop. - headerNumSlots = 0 - ifTrue: - [self setRawNumSlotsOf: objOop to: 1. - index := self baseHeaderSize + self allocationUnit / self allocationUnit] - ifFalse: - [bytes := self bytesInObject: objOop. - index := bytes / self allocationUnit. - self assert: index < self numFreeLists]. - self setFree: objOop. - self storePointer: self freeChunkNextIndex ofFreeChunk: objOop withValue: (freeLists at: index). - freeLists at: index put: objOop! Item was changed: ----- Method: SpurMemoryManager>>globalGarbageCollect (in category 'gc - global') ----- globalGarbageCollect <inline: true> "inline into fullGC" self assert: self validObjStacks. self assert: (self isEmptyObjStack: markStack). self assert: (self isEmptyObjStack: weaklingStack). + self markObjects: true. - self markObjects. - self expungeDuplicateAndUnmarkedClasses: true. - self nilUnmarkedWeaklingSlots. self freeUnmarkedObjectsAndSortAndCoalesceFreeSpaceForPigCompact. "Mid-way the leak check must be more lenient. Unmarked classes will have been expunged from the table, but unmarked instances will not yet have been reclaimed." self runLeakCheckerForFullGC: true excludeUnmarkedNewSpaceObjs: true classIndicesShouldBeValid: true. self compact. self setHeapSizeAtPreviousGC. self assert: self validObjStacks. self assert: (self isEmptyObjStack: markStack). self assert: (self isEmptyObjStack: weaklingStack). self assert: self allObjectsUnmarked. self runLeakCheckerForFullGC: true! Item was changed: ----- Method: SpurMemoryManager>>isHiddenObj: (in category 'debug support') ----- isHiddenObj: objOop + ^(self classIndexOf: objOop) <= self lastClassIndexPun! - ^objOop = self freeListsObject - or: [(self numSlotsOfAny: objOop) = ObjStackPageSlots - and: [self isValidObjStackPage: objOop myIndex: (self fetchPointer: ObjStackMyx ofObject: objOop)]]! Item was added: + ----- Method: SpurMemoryManager>>leakCheckImageSegments (in category 'debug support') ----- + leakCheckImageSegments + <api> + ^(checkForLeaks bitAnd: 16) ~= 0! Item was changed: + ----- Method: SpurMemoryManager>>loadImageSegmentFrom:outPointers: (in category 'image segment in/out') ----- + loadImageSegmentFrom: segmentWordArrayArg outPointers: outPointerArray - ----- Method: SpurMemoryManager>>loadImageSegmentFrom:outPointers: (in category 'primitive support') ----- - loadImageSegmentFrom: segmentWordArray outPointers: outPointerArray "This primitive is called from Squeak as... <imageSegment> loadSegmentFrom: aWordArray outPointers: anArray." + "This primitive will load a binary image segment created by primitiveStoreImageSegment. + It expects the outPointer array to be of the proper size, and the wordArray to be well formed. + It will return as its value the original array of roots, and the erstwhile segmentWordArray will + have been truncated to a size of zero. If this primitive should fail, the segmentWordArray will, + sadly, have been reduced to an unrecognizable and unusable jumble. But what more could you + have done with it anyway?" - "This primitive will load a binary image segment created by primitiveStoreImageSegment. It expects the outPointer array to be of the proper size, and the wordArray to be well formed. It will return as its value the original array of roots, and the erstwhile segmentWordArray will have been truncated to a size of zero. If this primitive should fail, the segmentWordArray will, sadly, have been reduced to an unrecognizable and unusable jumble. But what more could you have done with it anyway?" + "First thing is to verify format. If Spur is ever ported to big-endian machines then the segment + may have to be byte/word swapped, but so far it only runs on little-endian machines, so for now + just fail if endinanness is wrong." + + <inline: false> + | segmentWordArray firstNeedingPostProcessing numOutPointers objOop segLimit segStart segVersion topHashBit topOopBit | + segVersion := self longAt: segmentWordArrayArg + self baseHeaderSize. + (coInterpreter readableFormat: (segVersion bitAnd: 16rFFFF "low 2 bytes")) ifFalse: + [^PrimErrBadArgument]. + + "If segmentWordArrayArg is too short to be truncated, clone it so that the clone is long enough." + (self hasOverflowHeader: segmentWordArrayArg) + ifTrue: + [segmentWordArray := segmentWordArrayArg] + ifFalse: + [segmentWordArray := self allocateSlots: self numSlotsMask + 1 + format: (self formatOf: segmentWordArrayArg) + classIndex: (self classIndexOf: segmentWordArrayArg). + segmentWordArray ifNil: [^PrimErrNoMemory]. + self mem: segmentWordArray + self baseHeaderSize + cp: segmentWordArrayArg + self baseHeaderSize + y: (self numSlotsOf: segmentWordArrayArg) * self bytesPerOop]. + + segStart := segmentWordArray + self baseHeaderSize + self allocationUnit. + segLimit := (self numSlotsOf: segmentWordArrayArg) * self bytesPerOop + segmentWordArray + self baseHeaderSize. + + "scan through mapping oops and validating class references. + Defer entering any class objects into the class table and/or + pinning objects until a second pass." + numOutPointers := self numSlotsOf: outPointerArray. + firstNeedingPostProcessing := 0. + topHashBit := 1 bitShift: self identityHashFieldWidth - 1. + topOopBit := 1 bitShift: self bytesPerOop * 8 - 1. + objOop := self objectStartingAt: segStart. + [objOop < segLimit] whileTrue: + [| classIndex hash oop outPointer | + ((self isRemembered: objOop) or: [self isMarked: objOop]) ifTrue: + [^PrimErrInappropriate]. + (firstNeedingPostProcessing = 0 + and: [(self isInNewSpace: objOop) + and: [self isPinned: objOop]]) ifTrue: + [firstNeedingPostProcessing := objOop]. + classIndex := self classIndexOf: objOop. + (classIndex anyMask: topHashBit) + ifTrue: + [classIndex - topHashBit >= numOutPointers ifTrue: + [^PrimErrBadIndex]. + outPointer := self fetchPointer: classIndex - topHashBit ofObject: outPointerArray. + hash := self rawHashBitsOf: outPointer. + (hash > self lastClassIndexPun and: [(self classOrNilAtIndex: hash) = outPointer]) ifFalse: + [^PrimErrInappropriate]. + self setClassIndexOf: objOop to: hash] + ifFalse: "The class is contained within the segment." + [(oop := classIndex * self allocationUnit + segStart) >= segLimit ifTrue: + [^PrimErrBadIndex]. + (self rawHashBitsOf: oop) ~= 0 ifTrue: + [^PrimErrInappropriate]. + self setIsRememberedOf: objOop to: true. + "Don't populate the classTable until all oops have been mapped." + firstNeedingPostProcessing = 0 ifTrue: + [firstNeedingPostProcessing := objOop]]. + 0 to: (self numPointerSlotsOf: objOop) - 1 do: + [:i| + oop := self fetchPointer: i ofObject: objOop. + (self isNonImmediate: oop) ifTrue: + [(oop bitAnd: self allocationUnit - 1) ~= 0 ifTrue: + [^PrimErrInappropriate]. + (oop anyMask: topOopBit) + ifTrue: + [oop / self bytesPerOop >= numOutPointers ifTrue: + [^PrimErrBadIndex]. + outPointer := self fetchPointer: oop / self bytesPerOop ofObject: outPointerArray. + self storePointerUnchecked: i ofObject: objOop withValue: outPointer] + ifFalse: + [oop + segStart >= segLimit ifTrue: + [^PrimErrBadIndex]. + self storePointerUnchecked: i ofObject: objOop withValue: oop + segStart]]]. + objOop := self objectAfter: objOop limit: segLimit]. + + "Scan for classes contained in the segment, entering them into + the class table, and assigning the class indices of their instances." + firstNeedingPostProcessing ~= 0 ifTrue: + [objOop := firstNeedingPostProcessing. + self assert: (self isRemembered: objOop). + [objOop < segLimit] whileTrue: + [(self isRemembered: objOop) ifTrue: + [| classIndex hash oop errorCode | + self setIsRememberedOf: objOop to: false. + classIndex := self classIndexOf: objOop. + self deny: (classIndex anyMask: topHashBit). "The class is contained within the segment." + oop := classIndex * self allocationUnit + segStart. + (hash := self rawHashBitsOf: oop) = 0 ifTrue: "The class needs to be added to the classTable" + [(errorCode := self enterIntoClassTable: oop) ~= 0 ifTrue: + [objOop := self objectStartingAt: segStart. + [objOop < segLimit] whileTrue: + [hash := self rawHashBitsOf: objOop. + hash > self lastClassIndexPun and: [(self classOrNilAtIndex: hash) = objOop ifTrue: + [self expungeFromClassTable: objOop]. + objOop := self objectAfter: objOop limit: segLimit]]. + ^errorCode]. + hash := self rawHashBitsOf: oop]. + self setClassIndexOf: objOop to: hash]. + ((self isInNewSpace: objOop) + and: [self isPinned: objOop]) ifTrue: + [| oldClone | + oldClone := self cloneInOldSpaceForPinning: objOop. + oldClone ~= 0 ifTrue: + [self setIsPinnedOf: oldClone to: true. + self forward: objOop to: oldClone]]. + objOop := self objectAfter: objOop limit: segLimit]]. + + "Finally evaporate the container, leaving the newly loaded objects in place." + self setOverflowNumSlotsOf: segmentWordArray to: 0. + + self leakCheckImageSegments ifTrue: + [self runLeakCheckerForFullGC: true]. + + ^self objectStartingAt: segStart! - ^PrimErrUnsupported! Item was added: + ----- Method: SpurMemoryManager>>mappedOopOf:topHashBit:topOopBit: (in category 'image segment in/out') ----- + mappedOopOf: objOop topHashBit: topHashBit topOopBit: topOopBit + "objOop is an object whose hash has been set to its mapped oop in either the segment or the + out pointers. If its hash's top bit is set then it is in out pointers. Answer the mapped oop." + <inline: true> + | hash | + hash := self rawHashBitsOf: objOop. + ^(hash anyMask: topHashBit) + ifTrue: [hash - topHashBit * self bytesPerOop + topOopBit] + ifFalse: [hash * self allocationUnit]! Item was removed: - ----- Method: SpurMemoryManager>>markAccessibleObjects (in category 'gc - global') ----- - markAccessibleObjects - self assert: self validClassTableRootPages. - self assert: segmentManager allBridgesMarked. - self cCode: [] "for debugging markAndTrace: set (MarkStackRecord := OrderedCollection new)" - inSmalltalk: [MarkStackRecord ifNotNil: [MarkStackRecord resetTo: 1]]. - - marking := true. - "This must come first to enable stack page reclamation. It clears - the trace flags on stack pages and so must preceed any marking. - Otherwise it will clear the trace flags of reached pages." - coInterpreter initStackPageGC. - self markAndTraceHiddenRoots. - self markAndTraceExtraRoots. - self assert: self validClassTableRootPages. - coInterpreter markAndTraceInterpreterOops: true. - self assert: self validObjStacks. - self markWeaklingsAndMarkAndFireEphemerons. - self assert: self validObjStacks. - marking := false! Item was added: + ----- Method: SpurMemoryManager>>markAccessibleObjectsAndFireEphemerons (in category 'gc - global') ----- + markAccessibleObjectsAndFireEphemerons + self assert: self validClassTableRootPages. + self assert: segmentManager allBridgesMarked. + self cCode: [] "for debugging markAndTrace: set (MarkStackRecord := OrderedCollection new)" + inSmalltalk: [MarkStackRecord ifNotNil: [MarkStackRecord resetTo: 1]]. + + marking := true. + "This must come first to enable stack page reclamation. It clears + the trace flags on stack pages and so must preceed any marking. + Otherwise it will clear the trace flags of reached pages." + coInterpreter initStackPageGC. + self markAndTraceHiddenRoots. + self markAndTraceExtraRoots. + self assert: self validClassTableRootPages. + coInterpreter markAndTraceInterpreterOops: true. + self assert: self validObjStacks. + self markWeaklingsAndMarkAndFireEphemerons. + self assert: self validObjStacks. + marking := false! Item was removed: - ----- Method: SpurMemoryManager>>markAllExceptTransitiveClosureOf: (in category 'image segment in/out') ----- - markAllExceptTransitiveClosureOf: arrayOfRoots - "Mark all objects in the system except those in arrayOfRoots and objects only reachable from arrayOfRoots. - This is how the image segment writing primitive computes the set of objects to include in a segment." - - self assert: self allObjectsUnmarked. - self markObjectsIn: arrayOfRoots. - self markObjects. - self unmarkObjectsIn: arrayOfRoots.! Item was changed: ----- Method: SpurMemoryManager>>markAndTrace: (in category 'gc - global') ----- markAndTrace: objOop "Mark the argument, and all objects reachable from it, and any remaining objects on the mark stack. Follow forwarding pointers in the scan." <api> - | objToScan scanLargeObject numStrongSlots index field | "if markAndTrace: is to follow and eliminate forwarding pointers in its scan it cannot be handed an r-value which is forwarded. The assert for this is in markAndShouldScan:" (self markAndShouldScan: objOop) ifFalse: [^self]. "Now scan the object, and any remaining objects on the mark stack." + self markLoopFrom: objOop! - objToScan := objOop. - "To avoid overflowing the mark stack when we encounter large objects, we - push the obj, then its numStrongSlots, and then index the object from the stack." - [(self isImmediate: objToScan) - ifTrue: [scanLargeObject := true] - ifFalse: - [numStrongSlots := self numStrongSlotsOfInephemeral: objToScan. - scanLargeObject := numStrongSlots > self traceImmediatelySlotLimit]. - scanLargeObject - ifTrue: "scanning a large object. scan until hitting an unmarked object, then switch to it, if any." - [(self isImmediate: objToScan) - ifTrue: - [index := self integerValueOf: objToScan. - objToScan := self topOfObjStack: markStack] - ifFalse: - [index := numStrongSlots. - self markAndTraceClassOf: objToScan]. - [index > 0] whileTrue: - [index := index - 1. - field := self fetchPointer: index ofObject: objToScan. - (self isNonImmediate: field) ifTrue: - [(self isForwarded: field) ifTrue: "fixFollowedField: is /not/ inlined" - [field := self fixFollowedField: index ofObject: objToScan withInitialValue: field]. - (self markAndShouldScan: field) ifTrue: - [index > 0 ifTrue: - [(self topOfObjStack: markStack) ~= objToScan ifTrue: - [self push: objToScan onObjStack: markStack]. - self push: (self integerObjectOf: index) onObjStack: markStack]. - objToScan := field. - index := -1]]]. - index >= 0 ifTrue: "if loop terminated without finding an unmarked referent, switch to top of stack." - [objToScan := self popObjStack: markStack. - objToScan = objOop ifTrue: - [objToScan := self popObjStack: markStack]]] - ifFalse: "scanning a small object. scan, marking, pushing unmarked referents, then switch to the top of the stack." - [index := numStrongSlots. - self markAndTraceClassOf: objToScan. - [index > 0] whileTrue: - [index := index - 1. - field := self fetchPointer: index ofObject: objToScan. - (self isNonImmediate: field) ifTrue: - [(self isForwarded: field) ifTrue: "fixFollowedField: is /not/ inlined" - [field := self fixFollowedField: index ofObject: objToScan withInitialValue: field]. - (self markAndShouldScan: field) ifTrue: - [self push: field onObjStack: markStack. - ((self rawNumSlotsOf: field) > self traceImmediatelySlotLimit - and: [(numStrongSlots := self numStrongSlotsOfInephemeral: field) > self traceImmediatelySlotLimit]) ifTrue: - [self push: (self integerObjectOf: numStrongSlots) onObjStack: markStack]]]]. - objToScan := self popObjStack: markStack]. - objToScan notNil] whileTrue! Item was added: + ----- Method: SpurMemoryManager>>markLoopFrom: (in category 'gc - global') ----- + markLoopFrom: objOop + "Scan objOop and all objects on the mark stack, until the mark stack is empty. + N.B. When the incremental GC is written this will probably be refactored as + markLoopFrom: objOop while: aBlock" + <inline: true> + | objToScan field index numStrongSlots scanLargeObject | + + "Now scan the object, and any remaining objects on the mark stack." + objToScan := objOop. + "To avoid overflowing the mark stack when we encounter large objects, we + push the obj, then its numStrongSlots, and then index the object from the stack." + [(self isImmediate: objToScan) + ifTrue: [scanLargeObject := true] + ifFalse: + [numStrongSlots := self numStrongSlotsOfInephemeral: objToScan. + scanLargeObject := numStrongSlots > self traceImmediatelySlotLimit]. + scanLargeObject + ifTrue: "scanning a large object. scan until hitting an unmarked object, then switch to it, if any." + [(self isImmediate: objToScan) + ifTrue: + [index := self integerValueOf: objToScan. + objToScan := self topOfObjStack: markStack] + ifFalse: + [index := numStrongSlots. + self markAndTraceClassOf: objToScan]. + [index > 0] whileTrue: + [index := index - 1. + field := self fetchPointer: index ofObject: objToScan. + (self isNonImmediate: field) ifTrue: + [(self isForwarded: field) ifTrue: "fixFollowedField: is /not/ inlined" + [field := self fixFollowedField: index ofObject: objToScan withInitialValue: field]. + (self markAndShouldScan: field) ifTrue: + [index > 0 ifTrue: + [(self topOfObjStack: markStack) ~= objToScan ifTrue: + [self push: objToScan onObjStack: markStack]. + self push: (self integerObjectOf: index) onObjStack: markStack]. + objToScan := field. + index := -1]]]. + index >= 0 ifTrue: "if loop terminated without finding an unmarked referent, switch to top of stack." + [objToScan := self popObjStack: markStack. + objToScan = objOop ifTrue: + [objToScan := self popObjStack: markStack]]] + ifFalse: "scanning a small object. scan, marking, pushing unmarked referents, then switch to the top of the stack." + [index := numStrongSlots. + self markAndTraceClassOf: objToScan. + [index > 0] whileTrue: + [index := index - 1. + field := self fetchPointer: index ofObject: objToScan. + (self isNonImmediate: field) ifTrue: + [(self isForwarded: field) ifTrue: "fixFollowedField: is /not/ inlined" + [field := self fixFollowedField: index ofObject: objToScan withInitialValue: field]. + (self markAndShouldScan: field) ifTrue: + [self push: field onObjStack: markStack. + ((self rawNumSlotsOf: field) > self traceImmediatelySlotLimit + and: [(numStrongSlots := self numStrongSlotsOfInephemeral: field) > self traceImmediatelySlotLimit]) ifTrue: + [self push: (self integerObjectOf: numStrongSlots) onObjStack: markStack]]]]. + objToScan := self popObjStack: markStack]. + objToScan notNil] whileTrue! Item was removed: - ----- Method: SpurMemoryManager>>markObjects (in category 'gc - global') ----- - markObjects - <inline: #never> "for profiling" - "Mark all accessible objects." - "If the incremental collector is running mark bits may be set; stop it and clear them if necessary." - self cCode: '' inSmalltalk: [coInterpreter transcript nextPutAll: 'marking...'; flush]. - self runLeakCheckerForFullGC: true. - - self ensureAllMarkBitsAreZero. - self initializeUnscannedEphemerons. - self initializeMarkStack. - self initializeWeaklingStack. - self markAccessibleObjects! Item was added: + ----- Method: SpurMemoryManager>>markObjects: (in category 'gc - global') ----- + markObjects: objectsShouldBeUnmarked + <inline: #never> "for profiling" + "Mark all accessible objects. " + "If the incremental collector is running mark bits may be set; stop it and clear them if necessary." + self cCode: '' inSmalltalk: [coInterpreter transcript nextPutAll: 'marking...'; flush]. + self runLeakCheckerForFullGC: true. + + self shutDownIncrementalGC: objectsShouldBeUnmarked. + self initializeUnscannedEphemerons. + self initializeMarkStack. + self initializeWeaklingStack. + self markAccessibleObjectsAndFireEphemerons. + self expungeDuplicateAndUnmarkedClasses: true. + self nilUnmarkedWeaklingSlots! Item was added: + ----- Method: SpurMemoryManager>>markObjectsIn: (in category 'image segment in/out') ----- + markObjectsIn: arrayOfRoots + self setIsMarkedOf: arrayOfRoots to: true. + 0 to: (self numSlotsOf: arrayOfRoots) - 1 do: + [:i| | oop | + oop := self followField: i ofObject: arrayOfRoots. + (self isNonImmediate: oop) ifTrue: + [self setIsMarkedOf: oop to: true]]! Item was added: + ----- Method: SpurMemoryManager>>newOutPointer:at:in:hashes:topHashBit: (in category 'image segment in/out') ----- + newOutPointer: oop at: outIndex in: outPointerArray hashes: savedOutHashes topHashBit: topHashBit + "oop is a new outPointer; allocate its oop, and answer the new outIndex. + If outPointerArray is full, answer 0." + <inline: true> + outIndex >= (self rawOverflowSlotsOf: outPointerArray) ifTrue: + ["no room in outPointers; fail" + ^0]. + self storePointer: outIndex ofObject: outPointerArray withValue: oop. + self storeLong32: outIndex ofObject: savedOutHashes withValue: (self rawHashBitsOf: oop). + self setHashBitsOf: oop to: outIndex + topHashBit. + self setIsMarkedOf: oop to: true. + ^outIndex + 1! Item was added: + ----- Method: SpurMemoryManager>>numSlotsForShortening:toIndexableSize: (in category 'allocation') ----- + numSlotsForShortening: objOop toIndexableSize: indexableSize + self subclassResponsibility! Item was added: + ----- Method: SpurMemoryManager>>objectsReachableFromRoots: (in category 'image segment in/out') ----- + objectsReachableFromRoots: arrayOfRoots + "Answer an Array of all the objects only reachable from the argument, an Array of root objects, + starting with arrayOfRoots. If there is no space, answer a SmallInteger whose value is the + number of slots required. This is used to collect the objects to include in an image segment + on Spur, separate from creating the segment, hence simplifying the implementation. + Thanks to Igor Stasenko for this idea." + + | freeChunk ptr start limit count oop objOop | + self assert: (self isArray: arrayOfRoots). + "Mark all objects except those only reachable from the arrayOfRoots by marking + each object in arrayOfRoots and then marking all reachable objects (from the + system roots). This leaves unmarked only objects reachable from the arrayOfRoots. + N.B. A side-effect of the marking is that all forwarders in arrayOfRoots will be followed." + self assert: self allObjectsUnmarked. + self setIsMarkedOf: arrayOfRoots to: true. + self markObjects: false. + + "After the mark phase all unreachable weak slots will have been nilled + and all active ephemerons fired." + self assert: (self isEmptyObjStack: markStack). + self assert: (self isEmptyObjStack: weaklingStack). + self assert: self noUnscannedEphemerons. + + "Use the largest free chunk to answer the result." + freeChunk := self allocateLargestFreeChunk. + ptr := start := freeChunk + self baseHeaderSize. + limit := self addressAfter: freeChunk. + count := 0. + "First put the roots; order is important." + self push: arrayOfRoots onObjStack: markStack. + + "Now collect the unmarked objects reachable from the roots." + [self isEmptyObjStack: markStack] whileFalse: + [objOop := self popObjStack: markStack. + count := count + 1. + ptr < limit ifTrue: + [self longAt: ptr put: objOop. + ptr := ptr + self bytesPerSlot]. + oop := self fetchClassOfNonImm: objOop. + (self isMarked: oop) ifFalse: + [self setIsMarkedOf: objOop to: true. + self push: oop onObjStack: markStack]. + 0 to: (self numPointerSlotsOf: objOop) - 1 do: + [:i| + oop := self fetchPointer: i ofObject: objOop. + ((self isImmediate: oop) + or: [self isMarked: oop]) ifFalse: + [self setIsMarkedOf: objOop to: true. + self push: oop onObjStack: markStack]]]. + + self unmarkAllObjects. + + totalFreeOldSpace := totalFreeOldSpace - (self bytesInObject: freeChunk). + "Now try and allocate the result" + (count > (ptr - start / self bytesPerSlot) "not enough room" + or: [limit ~= ptr and: [limit - ptr <= self allocationUnit]]) ifTrue: "can't split a single word" + [self freeChunkWithBytes: (self bytesInObject: freeChunk) at: (self startOfObject: freeChunk). + self checkFreeSpace. + ^self integerObjectOf: count]. + "There's room; set the format, & classIndex and shorten." + self setFormatOf: freeChunk to: self arrayFormat. + self setClassIndexOf: freeChunk to: ClassArrayCompactIndex. + self shorten: freeChunk toIndexableSize: count. + self possibleRootStoreInto: freeChunk. + self checkFreeSpace. + self runLeakCheckerForFullGC: false. + ^freeChunk! Item was removed: - ----- Method: SpurMemoryManager>>restoreObjectsFrom:to:from:to: (in category 'image segment in/out') ----- - restoreObjectsFrom: firstIn to: lastIn from: firstSeg to: limitSeg - "Unforward objects" - | originalPtr originalObj copyPtr copyObj | - originalPtr := firstIn. - copyPtr := firstSeg. - [self oop: originalPtr isLessThanOrEqualTo: lastIn] whileTrue: - [originalObj := self longAt: originalPtr. - copyObj := self objectStartingAt: copyPtr. - self unforward: originalObj from: copyObj. - originalPtr := originalPtr + self bytesPerOop. - copyPtr := self addressAfter: copyObj]. - self assert: copyPtr = limitSeg! Item was added: + ----- Method: SpurMemoryManager>>restoreObjectsIn:savedHashes: (in category 'image segment in/out') ----- + restoreObjectsIn: objArray savedHashes: savedHashes + "Enumerate the objects in objArray,unmarking them and restoring their hashes + from the corresponding 32-bit slots in savedHashes. The first unused entry in + objArray will have a non-hash value entry in savedHashes. Free savedHashes." + <inline: false> + 0 to: (self numSlotsOf: objArray) - 1 do: + [:i| | hash oop | + (hash := self fetchLong32: i ofObject: savedHashes) > self maxIdentityHash ifTrue: + [(self isInOldSpace: savedHashes) ifTrue: + [self freeObject: savedHashes]. + ^self]. + oop := self fetchPointer: i ofObject: objArray. + self setHashBitsOf: oop to: hash. + self setIsMarkedOf: oop to: false]. + (self isInOldSpace: savedHashes) ifTrue: + [self freeObject: savedHashes]! Item was added: + ----- Method: SpurMemoryManager>>return:restoringObjectsIn:savedHashes:and:savedHashes: (in category 'image segment in/out') ----- + return: errCode restoringObjectsIn: firstArray savedHashes: firstSavedHashes and: secondArray savedHashes: secondSavedHashes + self restoreObjectsIn: firstArray savedHashes: firstSavedHashes. + self restoreObjectsIn: secondArray savedHashes: secondSavedHashes. + self leakCheckImageSegments ifTrue: + [self runLeakCheckerForFullGC: true]. + self assert: self allObjectsUnmarked. + ^errCode! Item was changed: ----- Method: SpurMemoryManager>>shorten:toIndexableSize: (in category 'allocation') ----- shorten: objOop toIndexableSize: indexableSize "Reduce the number of indexable fields in objOop, a pointer object, to nSlots. Convert the + unused residual to a free chunk. Without changes to numSlotsForShortening:toIndexableSize: + this only works for arrayFormat and longFormat objects. - unused residual to a free chunk. Word and byte indexable objects are not changed. Answer the number of bytes returned to free memory, which may be zero if no change was possible." <inline: false> + | numSlots bytesBefore delta freeChunk | + numSlots := self numSlotsForShortening: objOop toIndexableSize: indexableSize. + numSlots = (self numSlotsOf: objOop) ifTrue: + [^0]. - | numSlots bytesBefore bytesAfter | - (self formatOf: objOop) caseOf: - { [self arrayFormat] -> [numSlots := indexableSize] }. bytesBefore := self bytesInObject: objOop. (self hasOverflowHeader: objOop) ifTrue: [self rawOverflowSlotsOf: objOop put: numSlots] ifFalse: [self assert: numSlots < self numSlotsMask. self rawNumSlotsOf: objOop put: numSlots]. + delta := bytesBefore - (self bytesInObject: objOop). + freeChunk := self initFreeChunkWithBytes: delta at: (self addressAfter: objOop). + (self isInOldSpace: objOop) + ifTrue: + [totalFreeOldSpace := totalFreeOldSpace + delta. + self addToFreeList: freeChunk bytes: delta] + ifFalse: + [self + setClassIndexOf: freeChunk to: self wordSizeClassIndexPun; + setFormatOf: freeChunk to: self firstLongFormat]. + ^delta! - bytesAfter := self bytesInObject: objOop. - self freeChunkWithBytes: bytesAfter - bytesBefore at: (self addressAfter: objOop). - ^bytesAfter - bytesBefore! Item was added: + ----- Method: SpurMemoryManager>>shutDownIncrementalGC: (in category 'gc - incremental') ----- + shutDownIncrementalGC: objectsShouldBeUnmarked + "If the incremental collector is running mark bits may be set; stop it and clear them if necessary." + self flag: 'need to implement the inc GC first...'. + objectsShouldBeUnmarked ifTrue: + [self assert: self allObjectsUnmarked]! Item was changed: ----- Method: SpurMemoryManager>>storeImageSegmentInto:outPointers:roots: (in category 'image segment in/out') ----- storeImageSegmentInto: segmentWordArray outPointers: outPointerArray roots: arrayOfRoots "This primitive is called from Squeak as... + <imageSegment> storeSegmentFor: arrayOfRoots into: aWordArray outPointers: anArray. - <imageSegment> storeSegmentFor: arrayOfRoots into: aWordArray outPointers: anArray." + This primitive will store a binary image segment (in the same format as objercts in the heap) of the + set of objects in arrayOfObjects. All pointers from within the set to objects outside the set will be + copied into the array of outPointers. In their place in the image segment will be an oop equal to the + offset in the outPointer array (the first would be 4). but with the high bit set. - "This primitive will store a binary image segment (in the same format as the Squeak image file) of the receiver and every object in its proper tree of subParts (ie, that is not refered to from anywhere else outside the tree). All pointers from within the tree to objects outside the tree will be copied into the array of outpointers. In their place in the image segment will be an oop equal to the offset in the outPointer array (the first would be 4). but with the high bit set." + The primitive expects the segmentWordArray and outPointerArray to be more than adequately long. + In this case it returns normally, and truncates the two arrays to exactly the right size. To simplify + truncation, both incoming arrays are required to be whatever the objectMemory considers long + objects. If either array is too small, the primitive will fail. - "The primitive expects the array and wordArray to be more than adequately long. In this case it returns normally, and truncates the two arrays to exactly the right size. To simplify truncation, both incoming arrays are required to have large headers (i.e. be 256 words long or larger). If either array is too small, the primitive will fail, but in no other case. + The primitive can fail for the following reasons with the specified failure codes: + PrimErrWritePastObject: the segmentWordArray is too small + PrimErrBadIndex: the outPointerArray is too small + PrimErrNoMemory: additional allocations failed + PrimErrLimitExceeded: there is no room in the hash field to store object oops." + <inline: false> + | arrayOfObjects savedInHashes savedOutHashes fillValue endSeg segAddr topHashBit objOop outIndex segStart topOopBit | - During operation of the primitive, it is necessary to convert from both internal and external oops to their mapped values. To make this fast, the original objects in question are forwarded to the mapped values. Tables are kept of both kinds of oops. Note that markObjects eliminates forwarding pointers, so there will be no forwarding pointers in the object graph once objects have been marked. + (self hasOverflowHeader: segmentWordArray) ifFalse: "Must have 128-bit header" + [^PrimErrWritePastObject]. + (self hasOverflowHeader: outPointerArray) ifFalse: "Must have 128-bit header" + [^PrimErrBadIndex]. - To be specific, there are two similar tables, the outPointer array, and one in the upper eight of the segmentWordArray. Each grows oops from the bottom up. + self leakCheckImageSegments ifTrue: + [self runLeakCheckerForFullGC: true]. - In case of either success or failure, the headers must be restored. In the event of primitive failure, the table of outPointers must also be nilled out (since the garbage in the high half will not have been discarded)." + "First compute the transitive closure, collecting the sequence of objects to be stored in the arrayOfObjects array." + arrayOfObjects := self objectsReachableFromRoots: arrayOfRoots. + arrayOfObjects ifNil: + [^PrimErrNoMemory]. - | endSeg firstIn firstOut lastIn lastOut limitSeg scanned newSegLimit unmarkedClasses | - true ifTrue: [^PrimErrUnsupported] ifFalse: [ + + "The scheme is to copy the objects into segmentWordArray, and then map the oops in sementWordArray. + Therefore the primitive needs to both map efficiently originals to copies in segmentWordArray and + be able to undo any side-effects if the primitive fails because either sementWordArray or outPointerArray + is too small. The mapping is done by having the originals (either the objects in arrayOfObjects or the + objects in outPointerArray) refer to their mapped locations through their identityHash, and saving their + identityHashes in two ByteArrays, one that mirrors arrayOfObjects, and one that mirrors outPointerArray. + Since arrayOfObjects and its saved hashes, and outPointerArray and its saved hashes, can be enumerated + side-by-side, the hashes can be restored to the originals. So the hash of an object in arrayOfObjects + is set to its offset in segmentWordArray / self allocationUnit, and the hash of an object in outPointerArray + is set to its index in outPointerArray plus the top hash bit. Oops in segmentWordArray are therefore + mapped by accessing the original oop's identityHash, testing the bottom bit to distinguish between internal + and external oops. The saved hash arrays are initialized with an out-of-range hash value so that the first + unused entry can be identified." - ((self hasOverflowHeader: outPointerArray) "Must have 128-bit header" - and: [self hasOverflowHeader: segmentWordArray]) ifFalse: "Must have 128-bit header" - [^PrimErrGenericFailure]. + savedInHashes := self allocateSlots: (self numSlotsForBytes: (self numSlotsOf: arrayOfObjects) * 4) + format: self firstLongFormat + classIndex: self thirtyTwoBitLongsClassIndexPun. + savedOutHashes := self allocateSlots: (self numSlotsForBytes: (self numSlotsOf: outPointerArray) * 4) + format: self firstLongFormat + classIndex: self thirtyTwoBitLongsClassIndexPun. + (savedInHashes isNil or: [savedOutHashes isNil]) ifTrue: + [^PrimErrNoMemory]. + fillValue := self wordSize = 4 ifTrue: [self maxIdentityHash + 1] ifFalse: [self maxIdentityHash + 1 << 32 + (self maxIdentityHash + 1)]. + self fillObj: savedInHashes numSlots: (self numSlotsOf: savedInHashes) with: fillValue. + self fillObj: savedOutHashes numSlots: (self numSlotsOf: savedOutHashes) with: fillValue. - firstOut := outPointerArray + self baseHeaderSize. - lastOut := firstOut - self bytesPerOop. + segAddr := segmentWordArray + self baseHeaderSize. + endSeg := self addressAfter: segmentWordArray. - limitSeg := segmentWordArray + self baseHeaderSize. - endSeg := segmentWordArray + (self addressAfter: segmentWordArray). + "Write a version number for byte order and version check." + segAddr >= endSeg ifTrue: [^PrimErrGenericFailure]. + self long32At: segAddr put: self imageSegmentVersion. + self long32At: segAddr + 4 put: self imageSegmentVersion. + segStart := segAddr := segAddr + self allocationUnit. - "Allocate top 1/8 of segment for table of internal oops" - firstIn := endSeg - ((self numSlotsOf: segmentWordArray) // 8). "Take 1/8 of seg" - lastIn := firstIn - self bytesPerOop. + self assert: self allObjectsUnmarked. "work to be done when the incremental GC is written" - "N.B. A side effect of this marking is that all forwarders are followed, - so while forwarders may exist in te heap they will *not* be reachable." - self markAllExceptTransitiveClosureOf: arrayOfRoots. + 0 to: (self numSlotsOf: arrayOfObjects) - 1 do: + [:i| | newSegAddrOrError | + objOop := self fetchPointer: i ofObject: arrayOfObjects. + self deny: ((self isImmediate: objOop) or: [self isForwarded: objOop]). + self storeLong32: i ofObject: savedInHashes withValue: (self rawHashBitsOf: objOop). + newSegAddrOrError := self copyObj: objOop toAddr: segAddr startAt: segStart stopAt: endSeg. + newSegAddrOrError < segStart ifTrue: + [^self return: newSegAddrOrError + restoringObjectsIn: arrayOfObjects savedHashes: savedInHashes + and: outPointerArray savedHashes: savedOutHashes]. + segAddr := newSegAddrOrError]. - "All external objects, and only they, are now marked." - unmarkedClasses := self arrayOfUnmarkedClasses. - (self isImmediate: unmarkedClasses) ifTrue: - [^PrimErrGenericFailure]. + (endSeg ~= segAddr + and: [endSeg - segAddr < (self baseHeaderSize + self bytesPerSlot)]) ifTrue: + [^self return: PrimErrWritePastObject + restoringObjectsIn: arrayOfObjects savedHashes: savedInHashes + and: outPointerArray savedHashes: savedOutHashes]. - "Write a version number for byte order and version check, followed by the number of classes." - limitSeg >= endSeg ifTrue: [^PrimErrGenericFailure]. - self long32At: limitSeg put: self imageSegmentVersion. - self long32At: limitSeg + 4 put: (self numSlotsOf: unmarkedClasses). - scanned := limitSeg := limitSeg + 8. + "Now scan, adding out pointers to the outPointersArray; all objects in arrayOfObjects + have their hashes set to point to their copies in segmentWordArray." + outIndex := 0. + self fillObj: outPointerArray numSlots: (self numSlotsOf: outPointerArray) with: nilObj. + topHashBit := 1 bitShift: self identityHashFieldWidth - 1. + topOopBit := 1 bitShift: self bytesPerOop * 8 - 1. + objOop := self objectStartingAt: segStart. + [objOop < segAddr] whileTrue: + [| oop hash | + oop := self fetchClassOfNonImm: objOop. + (self isMarked: oop) ifFalse: "oop is a new outPointer; allocate its oop" + [outIndex := self newOutPointer: oop at: outIndex in: outPointerArray hashes: savedOutHashes topHashBit: topHashBit. + outIndex = 0 ifTrue:"no room in outPointers; fail" + [^self return: PrimErrBadIndex + restoringObjectsIn: arrayOfObjects savedHashes: savedInHashes + and: outPointerArray savedHashes: savedOutHashes]]. + hash := self rawHashBitsOf: oop. + self setClassIndexOf: objOop to: hash. + 0 to: (self numPointerSlotsOf: objOop) - 1 do: + [:i| + oop := self fetchPointer: i ofObject: objOop. + (self isNonImmediate: oop) ifTrue: + [(self isMarked: oop) ifFalse: "oop is a new outPointer; allocate its oop" + [outIndex := self newOutPointer: oop at: outIndex in: outPointerArray hashes: savedOutHashes topHashBit: topHashBit. + outIndex = 0 ifTrue: "no room in outPointers; fail" + [^self return: PrimErrBadIndex + restoringObjectsIn: arrayOfObjects savedHashes: savedInHashes + and: outPointerArray savedHashes: savedOutHashes]]. + oop := self mappedOopOf: oop topHashBit: topHashBit topOopBit: topOopBit.. + self storePointerUnchecked: i ofObject: objOop withValue: oop]]. + objOop := self objectAfter: objOop limit: segAddr]. - "If there are any classes then copy them into the segment, and forward their oop." - (self numSlotsOf: unmarkedClasses) > 0 ifTrue: - [((lastIn := lastIn + self bytesPerOop) >= endSeg - or: [0 = (newSegLimit := self copyObj: arrayOfRoots toSegment: segmentWordArray addr: limitSeg stopAt: firstIn saveOopAt: lastIn)]) ifTrue: - [lastIn := lastIn - self bytesPerWord. - self restoreObjectsFrom: firstIn to: lastIn from: segmentWordArray + self baseHeaderSize to: limitSeg. - self fillObj: outPointerArray numSlots: (self numSlotsOf: outPointerArray) with: nilObj. - ^PrimErrGenericFailure]. - limitSeg := newSegLimit]. + self shorten: segmentWordArray toIndexableSize: segAddr - (segmentWordArray + self baseHeaderSize) / 4. + self shorten: outPointerArray toIndexableSize: outIndex. + ^self return: PrimNoErr + restoringObjectsIn: arrayOfObjects savedHashes: savedInHashes + and: outPointerArray savedHashes: savedOutHashes! - "Copy the array of roots into the segment, and forward its oop." - ((lastIn := lastIn + self bytesPerOop) >= endSeg - or: [0 = (newSegLimit := self copyObj: arrayOfRoots toSegment: segmentWordArray addr: limitSeg stopAt: firstIn saveOopAt: lastIn)]) ifTrue: - [lastIn := lastIn - self bytesPerWord. - self restoreObjectsFrom: firstIn to: lastIn from: segmentWordArray + self baseHeaderSize to: limitSeg. - self fillObj: outPointerArray numSlots: (self numSlotsOf: outPointerArray) with: nilObj. - ^PrimErrGenericFailure]. - limitSeg := newSegLimit. - - "Now traverse the objects copied to the segment so far, copying unmarked objects into the segment. - This is essentially the same algorithm as the breadth-first copying algorithm in scavenging." - scanned := self objectStartingAt: scanned. - [scanned < limitSeg] whileTrue: - [1 to: (self numPointerSlotsOf: scanned) do: - [:i| | oop | - oop := self fetchPointer: i ofObject: scanned. - ((self isImmediate: oop) or: [(self isForwarded: oop) or: [self isMarked: oop]]) ifFalse: - [((lastIn := lastIn + self bytesPerOop) >= endSeg - or: [0 = (newSegLimit := self copyObj: oop toSegment: segmentWordArray addr: limitSeg stopAt: firstIn saveOopAt: lastIn)]) ifTrue: - [lastIn := lastIn - self bytesPerWord. - self restoreObjectsFrom: firstIn to: lastIn from: segmentWordArray + self baseHeaderSize to: limitSeg. - self fillObj: outPointerArray numSlots: (self numSlotsOf: outPointerArray) with: nilObj. - ^PrimErrGenericFailure]. - limitSeg := newSegLimit]]. - scanned := self objectAfter: scanned]. - - "Now the primitive can not fail; traverse the objects in the segment, unforwarding the originals and mapping external oops." - self flag: 'you are here']! Item was removed: - ----- Method: SpurMemoryManager>>unforward:from: (in category 'image segment in/out') ----- - unforward: obj1 from: obj2 - "Undo a forward: obj1 to: obj2 given that obj2 is a copy of obj1" - self set: obj1 classIndexTo: (self classIndexOf: obj2) formatTo: (self formatOf: obj2). - self storePointer: 0 ofForwarder: obj1 withValue: (self fetchPointer: 0 ofObject: obj2). - (self rawNumSlotsOf: obj2) = 0 ifTrue: - [self setRawNumSlotsOf: obj1 to: 0]! Item was changed: ----- Method: StackInterpreter>>findClassContainingMethod:startingAt: (in category 'debug support') ----- findClassContainingMethod: meth startingAt: classObj | currClass classDict classDictSize methodArray i | (objectMemory isOopForwarded: classObj) ifTrue: [currClass := objectMemory followForwarded: classObj] ifFalse: [currClass := classObj]. [self assert: (objectMemory isForwarded: currClass) not. classDict := objectMemory noFixupFollowField: MethodDictionaryIndex ofObject: currClass. self assert: (objectMemory isForwarded: classDict) not. classDictSize := objectMemory numSlotsOf: classDict. + classDictSize > MethodArrayIndex ifTrue: + [methodArray := objectMemory noFixupFollowField: MethodArrayIndex ofObject: classDict. + self assert: (objectMemory isForwarded: methodArray) not. + i := 0. + [i < (classDictSize - SelectorStart)] whileTrue: + [meth = (objectMemory noFixupFollowField: i ofObject: methodArray) ifTrue: + [^currClass]. + i := i + 1]]. - methodArray := objectMemory noFixupFollowField: MethodArrayIndex ofObject: classDict. - self assert: (objectMemory isForwarded: methodArray) not. - i := 0. - [i < (classDictSize - SelectorStart)] whileTrue: - [meth = (objectMemory noFixupFollowField: i ofObject: methodArray) ifTrue: - [^currClass]. - i := i + 1]. currClass := self noFixupSuperclassOf: currClass. currClass = objectMemory nilObject] whileFalse. ^currClass "method not found in superclass chain"! Item was changed: ----- Method: StackInterpreter>>findSelectorAndClassForMethod:lookupClass:do: (in category 'debug support') ----- findSelectorAndClassForMethod: meth lookupClass: startClass do: binaryBlock "Search startClass' class hierarchy searching for method and if found, evaluate aBinaryBlock with the selector and class where the method is found. Otherwise evaluate aBinaryBlock with doesNotUnderstand: and nil." | currClass classDict classDictSize methodArray i | currClass := startClass. [classDict := objectMemory fetchPointer: MethodDictionaryIndex ofObject: currClass. classDictSize := objectMemory numSlotsOf: classDict. + classDictSize > MethodArrayIndex ifTrue: + [methodArray := objectMemory fetchPointer: MethodArrayIndex ofObject: classDict. + i := 0. + [i <= (classDictSize - SelectorStart)] whileTrue: + [meth = (objectMemory fetchPointer: i ofObject: methodArray) ifTrue: + [^binaryBlock + value: (objectMemory fetchPointer: i + SelectorStart ofObject: classDict) + value: currClass]. + i := i + 1]]. - methodArray := objectMemory fetchPointer: MethodArrayIndex ofObject: classDict. - i := 0. - [i <= (classDictSize - SelectorStart)] whileTrue: - [meth = (objectMemory fetchPointer: i ofObject: methodArray) ifTrue: - [^binaryBlock - value: (objectMemory fetchPointer: i + SelectorStart ofObject: classDict) - value: currClass]. - i := i + 1]. currClass := self superclassOf: currClass. currClass = objectMemory nilObject] whileFalse. ^binaryBlock "method not found in superclass chain" value: (objectMemory splObj: SelectorDoesNotUnderstand) value: nil! Item was changed: ----- Method: StackInterpreter>>findSelectorOfMethod: (in category 'debug support') ----- findSelectorOfMethod: methArg | meth classObj classDict classDictSize methodArray i | (objectMemory addressCouldBeObj: methArg) ifFalse: [^objectMemory nilObject]. (objectMemory isForwarded: methArg) ifTrue: [meth := objectMemory followForwarded: methArg] ifFalse: [meth := methArg]. (objectMemory isOopCompiledMethod: meth) ifFalse: [^objectMemory nilObject]. classObj := self safeMethodClassOf: meth. (self addressCouldBeClassObj: classObj) ifTrue: [classDict := objectMemory fetchPointer: MethodDictionaryIndex ofObject: classObj. classDictSize := objectMemory numSlotsOf: classDict. + classDictSize > MethodArrayIndex ifTrue: + [methodArray := objectMemory fetchPointer: MethodArrayIndex ofObject: classDict. + i := 0. + [i < (classDictSize - SelectorStart)] whileTrue: + [meth = (objectMemory fetchPointer: i ofObject: methodArray) ifTrue: + [^(objectMemory fetchPointer: i + SelectorStart ofObject: classDict)]. + i := i + 1]]]. - methodArray := objectMemory fetchPointer: MethodArrayIndex ofObject: classDict. - i := 0. - [i < (classDictSize - SelectorStart)] whileTrue: - [meth = (objectMemory fetchPointer: i ofObject: methodArray) ifTrue: - [^(objectMemory fetchPointer: i + SelectorStart ofObject: classDict)]. - i := i + 1]]. ^objectMemory nilObject! Item was changed: ----- Method: StackInterpreter>>readableFormat: (in category 'image save/restore') ----- readableFormat: imageVersion "Anwer true if images of the given format are readable by this interpreter. Allows a virtual machine to accept selected older image formats." ^imageVersion = self imageFormatVersion "Float words in platform-order" + or: [objectMemory hasSpurMemoryManagerAPI not "No compatibility version for Spur as yet" + and: [imageVersion = self imageFormatCompatibilityVersion]] "Float words in BigEndian order"! - or: [imageVersion = self imageFormatCompatibilityVersion] "Float words in BigEndian order"!

1 0

Image Segment semantics and weakness
by Eliot Miranda 22 Oct '14

22 Oct '14

Hi All, I want to check my understanding of reference semantics for image segments as I'm close to completing the Spur implementation. Specifically the question is whether objects reachable only through weak pointers should be included in an image segment or not. Remember that an image segment is created from the transitive closure of an Array of root objects, the *segment roots*. i.e. we can think of an image segment as a set of objects created by tracing the object graph from the segment roots. The segment always includes the segment roots. Except for the roots, objects are excluded from the segment that are also reachable form the roots of the system (the *system roots*, effectively the root environment, Smalltalk, and the stack of the current process). Consider a weak array in the transitive closure that is not reachable from the system roots, and hence should be included in the segment. Objects referenced from that weak array may be in one of three categories - reachable from the system roots (and hence not to be included in the segment) - *not* reachable form the system roots, but reachable from the segment roots via strong pointers (and hence to be included in the segment) - *not* reachable form the system roots, *not* reachable from the segment roots via strong pointers Should this last category be included or excluded from the segment? I think that it makes no difference, and excluding them is only an optimization. The argument is as follows. Imagine that immediately after loading the image segment there is a garbage collection. That garbage collection will collect all the objects in the last category as they are only reachable from the weak arrays in the segment. Hence we are free to follow weak references as if they are strong when we create the image segment, leaving it to subsequent events to reclaim those objects. An analogous argument accounts for objects reachable from ephemerons. Is my reasoning sound? -- best, Eliot

5 13

VM Maker: VMMakerJS-bf.13.mcz
by commits＠source.squeak.org 21 Oct '14

21 Oct '14

Bert Freudenberg uploaded a new version of VMMakerJS to project VM Maker: http://source.squeak.org/VMMaker/VMMakerJS-bf.13.mcz ==================== Summary ==================== Name: VMMakerJS-bf.13 Author: bf Time: 21 October 2014, 11:40:37.642 am UUID: 36eab1e9-25b2-414b-b7e6-4d54dd7c120c Ancestors: VMMakerJS-bf.12 Fix float-int conversion for Kedama =============== Diff against VMMakerJS-bf.12 =============== Item was changed: ----- Method: TAssignmentNode>>emitJSCodeOn:level:generator: (in category '*vmmakerjs') ----- emitJSCodeOn: aStream level: level generator: aCodeGen expression isSwitch ifTrue: [^expression emitJSCodeOn: aStream addToEndOfCases: self level: level generator: aCodeGen]. self isVariableUpdatingAssignment ifTrue: [(expression args first isConstant and: [expression args first value = 1]) ifTrue: [aStream nextPutAll: expression selector, expression selector. variable emitJSCodeOn: aStream level: level generator: aCodeGen] ifFalse: [ variable emitJSCodeOn: aStream level: level generator: aCodeGen. aStream nextPutAll: ' ', expression selector, '= '. expression args first emitJSCodeAsArgumentOn: aStream level: level generator: aCodeGen]] ifFalse: + [ | coerceToInt | + coerceToInt := (variable isFloatIn: aCodeGen) not and: [expression isFloatIn: aCodeGen]. + variable emitJSCodeOn: aStream level: level generator: aCodeGen. - [variable emitJSCodeOn: aStream level: level generator: aCodeGen. aStream nextPutAll: ' = '. + expression emitJSCodeAsArgumentOn: aStream level: level generator: aCodeGen. + coerceToInt ifTrue: [aStream nextPutAll: '|0'].]! - expression emitJSCodeAsArgumentOn: aStream level: level generator: aCodeGen]! Item was added: + ----- Method: TAssignmentNode>>isFloatIn: (in category '*vmmakerjs') ----- + isFloatIn: aCodeGen + ^variable isFloatIn: aCodeGen! Item was added: + ----- Method: TConstantNode>>isFloatIn: (in category '*vmmakerjs') ----- + isFloatIn: aCodeGen + ^value isFloat! Item was added: + ----- Method: TSendNode>>isFloatIn: (in category '*vmmakerjs') ----- + isFloatIn: aCodeGen + selector precedence = 2 ifFalse: [^false]. + ^ (receiver isFloatIn: aCodeGen) + or: [arguments first isFloatIn: aCodeGen]! Item was added: + ----- Method: TVariableNode>>isFloatIn: (in category '*vmmakerjs') ----- + isFloatIn: aCodeGen + | type | + type := aCodeGen typeOfVariable: name. + type isNil ifTrue: [^false]. + (type includes: $*) ifTrue: [^false]. + (type beginsWithAnyOf: #('register ' 'static ')) ifTrue: [type := type copyAfter: $ ]. + (type beginsWithAnyOf: #('double ' 'float ')) ifTrue: [^true]. + (type beginsWithAnyOf: #('int ' 'unsigned ' 'sqInt ' 'usqInt ' 'var ')) ifTrue: [^false]. + self halt: 'need to handle ', type!

1 0

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev October 2014