Vm-dev August 2018

vm-dev@lists.squeakfoundation.org

20 participants
87 discussions

[OpenSmalltalk/opensmalltalk-vm] c729eb: Add a script to create a VMMaker image for Pharo6.
by GitHub 14 Aug '18

14 Aug '18

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: c729eb6dd99b069848e854e74714736e90c06ea0 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/c729eb6dd99b069848… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2018-08-13 (Mon, 13 Aug 2018) Changed paths: A image/BuildPharo6VMMakerImage.st M image/BuildSqueakSpurTrunkVMMakerImage.st A image/PharoWorkspace.text Log Message: ----------- Add a script to create a VMMaker image for Pharo6. Eliminate the unused FT2Plugin support from the Squeak VMMaker build script. **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/ Functionality will be removed from GitHub.com on January 31st, 2019.

1 0

VM Maker: VMMaker.oscog-eem.2429.mcz
by commits＠source.squeak.org 14 Aug '18

14 Aug '18

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.2429.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.2429 Author: eem Time: 13 August 2018, 4:13:58.493394 pm UUID: ca51a594-525f-41d4-aee6-b30e8009415b Ancestors: VMMaker.oscog-eem.2428 Oops; there were two... =============== Diff against VMMaker.oscog-eem.2428 =============== Item was changed: ----- Method: InterpreterSimulator>>openOn:extraMemory: (in category 'initialization') ----- openOn: fileName extraMemory: extraBytes "InterpreterSimulator new openOn: 'clone.im' extraMemory: 100000" | f version headerSize count oldBaseAddr bytesToShift swapBytes | "open image file and read the header" ["begin ensure block..." f := FileStream readOnlyFileNamed: fileName. imageName := f fullName. f binary. version := self nextLongFrom: f. "current version: 16r1968 (=6504) vive la revolucion!!" (self readableFormat: version) ifTrue: [swapBytes := false] ifFalse: [(version := self byteSwapped: version) = self imageFormatVersion ifTrue: [swapBytes := true] ifFalse: [self error: 'incomaptible image format']]. headerSize := self nextLongFrom: f swap: swapBytes. self setEndOfMemory: (self nextLongFrom: f swap: swapBytes). "first unused location in heap" oldBaseAddr := self nextLongFrom: f swap: swapBytes. "object memory base address of image" specialObjectsOop := self nextLongFrom: f swap: swapBytes. lastHash := self nextLongFrom: f swap: swapBytes. "Should be loaded from, and saved to the image header" lastHash = 0 ifTrue: [lastHash := 999]. savedWindowSize := self nextLongFrom: f swap: swapBytes. fullScreenFlag := self nextLongFrom: f swap: swapBytes. extraVMMemory := self nextLongFrom: f swap: swapBytes. "allocate interpreter memory" self setMemoryLimit: endOfMemory + extraBytes. "read in the image in bulk, then swap the bytes if necessary" f position: headerSize. memory := Bitmap new: memoryLimit // 4. count := f readInto: memory startingAt: 1 count: endOfMemory // 4. count ~= (endOfMemory // 4) ifTrue: [self halt]. ] ensure: [f close]. swapBytes ifTrue: [UIManager default informUser: 'Swapping bytes of foreign image...' during: [self reverseBytesInImage]]. self initialize. bytesToShift := self startOfMemory - oldBaseAddr. "adjust pointers for zero base address" + UIManager default + informUser: 'Relocating object pointers...' + during: [self initializeInterpreter: bytesToShift]! - Utilities informUser: 'Relocating object pointers...' - during: [self initializeInterpreter: bytesToShift]. - !

1 0

VM Maker: VMMakerCompatibilityForPharo6-eem.1.mcz
by commits＠source.squeak.org 14 Aug '18

14 Aug '18

Eliot Miranda uploaded a new version of VMMakerCompatibilityForPharo6 to project VM Maker: http://source.squeak.org/VMMaker/VMMakerCompatibilityForPharo6-eem.1.mcz ==================== Summary ==================== Name: VMMakerCompatibilityForPharo6-eem.1 Author: eem Time: 13 August 2018, 4:11:01.718248 pm UUID: f1ffa3f1-ba2f-0d00-8b88-25d10cb2214f Ancestors: Compatibility methods and classes for VMMaker when loaded into Pharo6. Right now gets around EndianDetector and the lack of MethodReference. ==================== Snapshot ==================== SystemOrganization addCategory: #VMMakerCompatibilityForPharo6! SystemOrganization addCategory: 'VMMakerCompatibilityForPharo6-System'! ----- Method: SmalltalkImage>>endianness (in category '*VMMakerCompatibilityForPharo6-accessing') ----- endianness "Pluralitas non est ponenda sine necessitate..." ^EndianDetector endianness! Object subclass: #MethodReference instanceVariableNames: 'classSymbol classIsMeta methodSymbol stringVersion category environment' classVariableNames: 'InvalidReference' poolDictionaries: '' category: 'VMMakerCompatibilityForPharo6-System'! !MethodReference commentStamp: 'eem 8/13/2018 15:59' prior: 0! A MethodReference is is a lightweight proxy for a CompiledMethod. Has methods for pointed to the CompileMethod's source statements, byte codes. Is heavily used by Tools. Instance Variables classIsMeta: Boolean class vs. instance classSymbol: Symbol for method's class (without class keyword if meta) methodSymbol: Symbol for method's selector stringVersion: 'Class>>selector:' format! ----- Method: MethodReference class>>class:selector: (in category 'instance creation') ----- class: aClass selector: aSelector ^ self class: aClass selector: aSelector environment: aClass environment.! ----- Method: MethodReference class>>class:selector:environment: (in category 'instance creation') ----- class: aClass selector: aSelector environment: anEnvironment ^ self new setStandardClass: aClass methodSymbol: aSelector environment: anEnvironment.! ----- Method: MethodReference class>>cleanUp: (in category 'class initialization') ----- cleanUp: aggressive aggressive ifTrue: [InvalidReference := nil].! ----- Method: MethodReference class>>invalid (in category 'instance creation') ----- invalid "Creates an invalid method reference to avoid the usage of nil." ^ InvalidReference ifNil: [ InvalidReference := self new setClassSymbol: #NonExistentClass classIsMeta: false methodSymbol: #nonExistentSelector stringVersion: '<The Invalid Method Reference>']! ----- Method: MethodReference>><= (in category 'comparing') ----- <= anotherMethodReference classSymbol < anotherMethodReference classSymbol ifTrue: [^true]. classSymbol > anotherMethodReference classSymbol ifTrue: [^false]. classIsMeta = anotherMethodReference classIsMeta ifFalse: [^classIsMeta not]. ^methodSymbol <= anotherMethodReference methodSymbol! ----- Method: MethodReference>>= (in category 'comparing') ----- = anotherMethodReference "Answer whether the receiver and the argument represent the same object." ^ self species == anotherMethodReference species and: [self classSymbol = anotherMethodReference classSymbol and: [self classIsMeta = anotherMethodReference classIsMeta and: [self methodSymbol = anotherMethodReference methodSymbol and: [self environment == anotherMethodReference environment]]]]! ----- Method: MethodReference>>actualClass (in category 'accessing') ----- actualClass ^self environment at: classSymbol ifPresent: [ :actualClass | classIsMeta ifTrue: [ actualClass classSide ] ifFalse: [ actualClass ] ]! ----- Method: MethodReference>>asCodeReference (in category 'converting') ----- asCodeReference ^ self! ----- Method: MethodReference>>asString (in category 'converting') ----- asString ^(stringVersion ifNil: [ self stringVersionDefault ]) asString! ----- Method: MethodReference>>asStringOrText (in category 'converting') ----- asStringOrText ^stringVersion ifNil: [ self stringVersionDefault ]! ----- Method: MethodReference>>asValid (in category 'converting') ----- asValid "Sometimes persistent MethodReferences may become stale after a refactoring which moved some methods to a superclass. This method answers the new valid MethodReference if that happened." ^ self isValid ifTrue: [ self ] ifFalse: [ | cm | cm := self actualClass lookupSelector: self selector. cm ifNotNil: [ cm methodReference ] ]! ----- Method: MethodReference>>category (in category 'accessing') ----- category "Answers the class category (cached for reuse via MC and other tools)" ^ category ifNil: [category := self actualClass organization categoryOfElement: methodSymbol]! ----- Method: MethodReference>>category: (in category 'initialize-release') ----- category: aSymbol category := aSymbol! ----- Method: MethodReference>>classIsMeta (in category 'testing') ----- classIsMeta ^classIsMeta! ----- Method: MethodReference>>classSymbol (in category 'accessing') ----- classSymbol ^classSymbol! ----- Method: MethodReference>>compiledMethod (in category 'accessing') ----- compiledMethod ^self actualClass compiledMethodAt: methodSymbol ifAbsent: nil! ----- Method: MethodReference>>environment (in category 'accessing') ----- environment ^ environment ifNil: [ "We will probably have MethodReferences already instantiated when this commit lands. We lazily move these over to the new, Environment aware, order of things." environment := Smalltalk globals].! ----- Method: MethodReference>>hash (in category 'comparing') ----- hash "Answer a SmallInteger whose value is related to the receiver's identity." ^ (self species hash bitXor: self classSymbol hash) bitXor: self methodSymbol hash! ----- Method: MethodReference>>isClassReference (in category 'testing') ----- isClassReference ^ false! ----- Method: MethodReference>>isMethodReference (in category 'testing') ----- isMethodReference ^ true! ----- Method: MethodReference>>isValid (in category 'testing') ----- isValid "Answer whether the receiver represents a current selector or Comment" | aClass | methodSymbol isDoIt ifTrue: [^ false]. (aClass := self actualClass) ifNil: [^ false]. ^ (aClass includesSelector: methodSymbol) or: [methodSymbol == #Comment]! ----- Method: MethodReference>>methodSymbol (in category 'accessing') ----- methodSymbol ^methodSymbol! ----- Method: MethodReference>>printOn: (in category 'printing') ----- printOn: aStream | actualClass | "Print the receiver on a stream" actualClass := classSymbol asString. classIsMeta ifTrue: [actualClass := actualClass, ' class']. super printOn: aStream. aStream nextPutAll: ' ', actualClass, ' >> ', methodSymbol printString.! ----- Method: MethodReference>>selector (in category 'accessing') ----- selector ^methodSymbol! ----- Method: MethodReference>>setClass:methodSymbol:stringVersion: (in category 'initialize-release') ----- setClass: aClass methodSymbol: methodSym stringVersion: aString classSymbol := aClass theNonMetaClass name. classIsMeta := aClass isMeta. methodSymbol := methodSym. environment := aClass environment. stringVersion := aString.! ----- Method: MethodReference>>setClassAndSelectorIn: (in category 'initialize-release') ----- setClassAndSelectorIn: csBlock ^csBlock value: self actualClass value: methodSymbol! ----- Method: MethodReference>>setClassSymbol:classIsMeta:methodSymbol:stringVersion: (in category 'initialize-release') ----- setClassSymbol: classSym classIsMeta: isMeta methodSymbol: methodSym stringVersion: aString classSymbol := classSym. classIsMeta := isMeta. methodSymbol := methodSym. stringVersion := aString.! ----- Method: MethodReference>>setStandardClass:methodSymbol: (in category 'initialize-release') ----- setStandardClass: aClass methodSymbol: methodSym classSymbol := aClass theNonMetaClass name. environment := aClass environment. classIsMeta := aClass isMeta. methodSymbol := methodSym. stringVersion := nil.! ----- Method: MethodReference>>setStandardClass:methodSymbol:environment: (in category 'initialize-release') ----- setStandardClass: aClass methodSymbol: aSelector environment: anEnvironment classSymbol := aClass theNonMetaClass name. classIsMeta := aClass isMeta. methodSymbol := aSelector. environment := anEnvironment. stringVersion := nil.! ----- Method: MethodReference>>source (in category 'accessing') ----- source ^ (self actualClass sourceCodeAt: methodSymbol) asString withSqueakLineEndings! ----- Method: MethodReference>>sourceCode (in category 'accessing') ----- sourceCode ^ self actualClass sourceCodeAt: self methodSymbol! ----- Method: MethodReference>>sourceString (in category 'accessing') ----- sourceString ^ self sourceCode asString! ----- Method: MethodReference>>stringVersion (in category 'accessing') ----- stringVersion ^stringVersion ifNil: [self asStringOrText]! ----- Method: MethodReference>>stringVersion: (in category 'accessing') ----- stringVersion: aString stringVersion := aString! ----- Method: MethodReference>>stringVersionDefault (in category 'accessing') ----- stringVersionDefault ^classSymbol, (classIsMeta ifTrue: [ ' class ' ] ifFalse: [' ']), methodSymbol ! ----- Method: MethodReference>>timeStamp (in category 'accessing') ----- timeStamp ^ self compiledMethod timeStamp!

1 0

VM Maker: VMMaker.oscog-eem.2428.mcz
by commits＠source.squeak.org 14 Aug '18

14 Aug '18

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.2428.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.2428 Author: eem Time: 13 August 2018, 3:27:58.198059 pm UUID: a41e2021-d5fb-46f3-870f-2f3f866c5631 Ancestors: VMMaker.oscog-AlistairGrant.2427 Work around some Squeak specificities. Update the VMMakerDecompilerTests decompilerFailures =============== Diff against VMMaker.oscog-AlistairGrant.2427 =============== Item was changed: ----- Method: CogVMSimulator>>openOn:extraMemory: (in category 'initialization') ----- openOn: fileName extraMemory: extraBytes "CogVMSimulator new openOn: 'clone.im' extraMemory: 100000" | f version headerSize dataSize count oldBaseAddr bytesToShift swapBytes headerFlags firstSegSize heapSize hdrNumStackPages hdrEdenBytes hdrMaxExtSemTabSize hdrCogCodeSize stackZoneSize methodCacheSize primTraceLogSize allocationReserve | "open image file and read the header" f := FileStream readOnlyFileNamed: fileName. f ifNil: [^self error: 'no image found']. "Set the image name and the first argument; there are no arguments during simulation unless set explicitly." systemAttributes at: 1 put: fileName; at: 2 put: nil. ["begin ensure block..." imageName := f fullName. f binary. version := self getWord32FromFile: f swap: false. "current version: 16r1968 (=6504) vive la revolucion!!" (self readableFormat: version) ifTrue: [swapBytes := false] ifFalse: [(version := version byteSwap32) = self imageFormatVersion ifTrue: [swapBytes := true] ifFalse: [self error: 'incomaptible image format']]. headerSize := self getWord32FromFile: f swap: swapBytes. dataSize := self getLongFromFile: f swap: swapBytes. "length of heap in file" oldBaseAddr := self getLongFromFile: f swap: swapBytes. "object memory base address of image" objectMemory specialObjectsOop: (self getLongFromFile: f swap: swapBytes). objectMemory lastHash: (self getLongFromFile: f swap: swapBytes). "Should be loaded from, and saved to the image header" savedWindowSize := self getLongFromFile: f swap: swapBytes. headerFlags := self getLongFromFile: f swap: swapBytes. self setImageHeaderFlagsFrom: headerFlags. extraVMMemory := self getWord32FromFile: f swap: swapBytes. hdrNumStackPages := self getShortFromFile: f swap: swapBytes. "4 stack pages is small. Should be able to run with as few as three. 4 should be comfortable but slow. 8 is a reasonable default. Can be changed via vmParameterAt: 43 put: n" numStackPages := desiredNumStackPages ~= 0 ifTrue: [desiredNumStackPages] ifFalse: [hdrNumStackPages = 0 ifTrue: [self defaultNumStackPages] ifFalse: [hdrNumStackPages]]. desiredNumStackPages := hdrNumStackPages. stackZoneSize := self computeStackZoneSize. "This slot holds the size of the native method zone in 1k units. (pad to word boundary)." hdrCogCodeSize := (self getShortFromFile: f swap: swapBytes) * 1024. cogCodeSize := desiredCogCodeSize ~= 0 ifTrue: [desiredCogCodeSize] ifFalse: [hdrCogCodeSize = 0 ifTrue: [cogit defaultCogCodeSize] ifFalse: [hdrCogCodeSize]]. desiredCogCodeSize := hdrCogCodeSize. self assert: f position = (objectMemory wordSize = 4 ifTrue: [40] ifFalse: [64]). hdrEdenBytes := self getWord32FromFile: f swap: swapBytes. objectMemory edenBytes: (desiredEdenBytes ~= 0 ifTrue: [desiredEdenBytes] ifFalse: [hdrEdenBytes = 0 ifTrue: [objectMemory defaultEdenBytes] ifFalse: [hdrEdenBytes]]). desiredEdenBytes := hdrEdenBytes. hdrMaxExtSemTabSize := self getShortFromFile: f swap: swapBytes. hdrMaxExtSemTabSize ~= 0 ifTrue: [self setMaxExtSemSizeTo: hdrMaxExtSemTabSize]. "pad to word boundary. This slot can be used for anything else that will fit in 16 bits. Preserve it to be polite to other VMs." the2ndUnknownShort := self getShortFromFile: f swap: swapBytes. self assert: f position = (objectMemory wordSize = 4 ifTrue: [48] ifFalse: [72]). firstSegSize := self getLongFromFile: f swap: swapBytes. objectMemory firstSegmentSize: firstSegSize. "For Open PICs to be able to probe the method cache during simulation the methodCache must be relocated to memory." methodCacheSize := methodCache size * objectMemory wordSize. primTraceLogSize := primTraceLog size * objectMemory wordSize. "allocate interpreter memory. This list is in address order, low to high. In the actual VM the stack zone exists on the C stack." heapBase := (Cogit guardPageSize + cogCodeSize + stackZoneSize + methodCacheSize + primTraceLogSize + self rumpCStackSize) roundUpTo: objectMemory allocationUnit. "compare memory requirements with availability" allocationReserve := self interpreterAllocationReserveBytes. objectMemory hasSpurMemoryManagerAPI ifTrue: [| freeOldSpaceInImage headroom | freeOldSpaceInImage := self getLongFromFile: f swap: swapBytes. headroom := objectMemory initialHeadroom: extraVMMemory givenFreeOldSpaceInImage: freeOldSpaceInImage. heapSize := objectMemory roundUpHeapSize: dataSize + headroom + objectMemory newSpaceBytes + (headroom > allocationReserve ifTrue: [0] ifFalse: [allocationReserve])] ifFalse: [heapSize := dataSize + extraBytes + objectMemory newSpaceBytes + (extraBytes > allocationReserve ifTrue: [0] ifFalse: [allocationReserve])]. heapBase := objectMemory setHeapBase: heapBase memoryLimit: heapBase + heapSize endOfMemory: heapBase + dataSize. self assert: cogCodeSize \\ 4 = 0. self assert: objectMemory memoryLimit \\ 4 = 0. self assert: self rumpCStackSize \\ 4 = 0. objectMemory allocateMemoryOfSize: objectMemory memoryLimit. "read in the image in bulk, then swap the bytes if necessary" f position: headerSize. count := objectMemory readHeapFromImageFile: f dataBytes: dataSize. count ~= dataSize ifTrue: [self halt]] ensure: [f close]. self moveMethodCacheToMemoryAt: objectMemory cogCodeBase + cogCodeSize + stackZoneSize. self movePrimTraceLogToMemoryAt: objectMemory cogCodeBase + cogCodeSize + stackZoneSize + methodCacheSize. self ensureImageFormatIsUpToDate: swapBytes. bytesToShift := objectMemory memoryBaseForImageRead - oldBaseAddr. "adjust pointers for zero base address" + UIManager default - Utilities informUser: 'Relocating object pointers...' during: [self initializeInterpreter: bytesToShift]. self initializeCodeGenerator! Item was changed: ----- Method: CogVMSimulator>>reverseBytesInImage (in category 'image save/restore') ----- reverseBytesInImage + UIManager default - Utilities informUser: 'Swapping bytes of foreign image...' during: [super reverseBytesInImage]! Item was changed: ----- Method: InterpreterSimulator>>openOn:extraMemory: (in category 'initialization') ----- openOn: fileName extraMemory: extraBytes "InterpreterSimulator new openOn: 'clone.im' extraMemory: 100000" | f version headerSize count oldBaseAddr bytesToShift swapBytes | "open image file and read the header" ["begin ensure block..." f := FileStream readOnlyFileNamed: fileName. imageName := f fullName. f binary. version := self nextLongFrom: f. "current version: 16r1968 (=6504) vive la revolucion!!" (self readableFormat: version) ifTrue: [swapBytes := false] ifFalse: [(version := self byteSwapped: version) = self imageFormatVersion ifTrue: [swapBytes := true] ifFalse: [self error: 'incomaptible image format']]. headerSize := self nextLongFrom: f swap: swapBytes. self setEndOfMemory: (self nextLongFrom: f swap: swapBytes). "first unused location in heap" oldBaseAddr := self nextLongFrom: f swap: swapBytes. "object memory base address of image" specialObjectsOop := self nextLongFrom: f swap: swapBytes. lastHash := self nextLongFrom: f swap: swapBytes. "Should be loaded from, and saved to the image header" lastHash = 0 ifTrue: [lastHash := 999]. savedWindowSize := self nextLongFrom: f swap: swapBytes. fullScreenFlag := self nextLongFrom: f swap: swapBytes. extraVMMemory := self nextLongFrom: f swap: swapBytes. "allocate interpreter memory" self setMemoryLimit: endOfMemory + extraBytes. "read in the image in bulk, then swap the bytes if necessary" f position: headerSize. memory := Bitmap new: memoryLimit // 4. count := f readInto: memory startingAt: 1 count: endOfMemory // 4. count ~= (endOfMemory // 4) ifTrue: [self halt]. ] ensure: [f close]. + swapBytes ifTrue: + [UIManager default + informUser: 'Swapping bytes of foreign image...' + during: [self reverseBytesInImage]]. - swapBytes ifTrue: [Utilities informUser: 'Swapping bytes of foreign image...' - during: [self reverseBytesInImage]]. self initialize. bytesToShift := self startOfMemory - oldBaseAddr. "adjust pointers for zero base address" Utilities informUser: 'Relocating object pointers...' during: [self initializeInterpreter: bytesToShift]. ! Item was changed: ----- Method: StackInterpreterSimulator>>openOn:extraMemory: (in category 'initialization') ----- openOn: fileName extraMemory: extraBytes "StackInterpreterSimulator new openOn: 'clone.im' extraMemory: 100000" | f version headerSize dataSize count oldBaseAddr bytesToShift swapBytes headerFlags heapBase firstSegSize heapSize hdrNumStackPages hdrEdenBytes hdrMaxExtSemTabSize allocationReserve | "open image file and read the header" f := FileStream readOnlyFileNamed: fileName. f ifNil: [^self error: 'no image found']. "Set the image name and the first argument; there are no arguments during simulation unless set explicitly." systemAttributes at: 1 put: fileName; at: 2 put: nil. ["begin ensure block..." imageName := f fullName. f binary. version := self getWord32FromFile: f swap: false. "current version: 16r1968 (=6504) vive la revolucion!!" (self readableFormat: version) ifTrue: [swapBytes := false] ifFalse: [(version := objectMemory byteSwapped: version) = self imageFormatVersion ifTrue: [swapBytes := true] ifFalse: [self error: 'incomaptible image format']]. headerSize := self getWord32FromFile: f swap: swapBytes. dataSize := self getLongFromFile: f swap: swapBytes. "length of heap in file" oldBaseAddr := self getLongFromFile: f swap: swapBytes. "object memory base address of image" objectMemory specialObjectsOop: (self getLongFromFile: f swap: swapBytes). objectMemory lastHash: (self getLongFromFile: f swap: swapBytes). "Should be loaded from, and saved to the image header" savedWindowSize := self getLongFromFile: f swap: swapBytes. headerFlags := self getLongFromFile: f swap: swapBytes. self setImageHeaderFlagsFrom: headerFlags. extraVMMemory := self getWord32FromFile: f swap: swapBytes. hdrNumStackPages := self getShortFromFile: f swap: swapBytes. "4 stack pages is small. Should be able to run with as few as three. 4 should be comfortable but slow. 8 is a reasonable default. Can be changed via vmParameterAt: 43 put: n" numStackPages := desiredNumStackPages ~= 0 ifTrue: [desiredNumStackPages] ifFalse: [hdrNumStackPages = 0 ifTrue: [self defaultNumStackPages] ifFalse: [hdrNumStackPages]]. desiredNumStackPages := hdrNumStackPages. "pad to word boundary. This slot can be used for anything else that will fit in 16 bits. It is used for the cog code size in Cog. Preserve it to be polite to other VMs." theUnknownShort := self getShortFromFile: f swap: swapBytes. self assert: f position = (objectMemory wordSize = 4 ifTrue: [40] ifFalse: [64]). hdrEdenBytes := self getWord32FromFile: f swap: swapBytes. objectMemory edenBytes: (hdrEdenBytes = 0 ifTrue: [objectMemory defaultEdenBytes] ifFalse: [hdrEdenBytes]). desiredEdenBytes := hdrEdenBytes. hdrMaxExtSemTabSize := self getShortFromFile: f swap: swapBytes. hdrMaxExtSemTabSize ~= 0 ifTrue: [self setMaxExtSemSizeTo: hdrMaxExtSemTabSize]. "pad to word boundary. This slot can be used for anything else that will fit in 16 bits. Preserve it to be polite to other VMs." the2ndUnknownShort := self getShortFromFile: f swap: swapBytes. self assert: f position = (objectMemory wordSize = 4 ifTrue: [48] ifFalse: [72]). firstSegSize := self getLongFromFile: f swap: swapBytes. objectMemory firstSegmentSize: firstSegSize. "compare memory requirements with availability" allocationReserve := self interpreterAllocationReserveBytes. objectMemory hasSpurMemoryManagerAPI ifTrue: [| freeOldSpaceInImage headroom | freeOldSpaceInImage := self getLongFromFile: f swap: swapBytes. headroom := objectMemory initialHeadroom: extraVMMemory givenFreeOldSpaceInImage: freeOldSpaceInImage. heapSize := objectMemory roundUpHeapSize: dataSize + headroom + objectMemory newSpaceBytes + (headroom > allocationReserve ifTrue: [0] ifFalse: [allocationReserve])] ifFalse: [heapSize := dataSize + extraBytes + objectMemory newSpaceBytes + (extraBytes > allocationReserve ifTrue: [0] ifFalse: [allocationReserve])]. "allocate interpreter memory" heapBase := objectMemory startOfMemory. objectMemory setHeapBase: heapBase memoryLimit: heapBase + heapSize endOfMemory: heapBase + dataSize. "bogus for Spur" objectMemory allocateMemoryOfSize: objectMemory memoryLimit. "read in the image in bulk, then swap the bytes if necessary" f position: headerSize. count := objectMemory readHeapFromImageFile: f dataBytes: dataSize. count ~= dataSize ifTrue: [self halt]] ensure: [f close]. self ensureImageFormatIsUpToDate: swapBytes. bytesToShift := objectMemory memoryBaseForImageRead - oldBaseAddr. "adjust pointers for zero base address" + UIManager default - Utilities informUser: 'Relocating object pointers...' during: [self initializeInterpreter: bytesToShift]! Item was changed: ----- Method: StackInterpreterSimulator>>reverseBytesInImage (in category 'image save/restore') ----- reverseBytesInImage + UIManager default - Utilities informUser: 'Swapping bytes of foreign image...' during: [super reverseBytesInImage]! Item was changed: ----- Method: VMClass class>>initialize (in category 'initialization') ----- initialize InitializationOptions ifNil: [InitializationOptions := Dictionary new]. + ExpensiveAsserts := false. + (Smalltalk classNamed: #Utilities) ifNotNil: + [:utilitiesClass| + (utilitiesClass classPool at: #CommonRequestStrings ifAbsent: []) ifNotNil: + [:commonRequestStringHolder| + (commonRequestStringHolder contents asString includesSubstring: 'VMClass open') ifFalse: + [Utilities appendToCommonRequests: '-\VMMaker generateConfiguration\VMMaker generateAllConfigurationsUnderVersionControl\VMMaker generateAllSpurConfigurations\VMClass openCogMultiWindowBrowser\VMClass openObjectMemoriesInterpretersBrowser\VMClass openSpurMultiWindowBrowser\VMClass openCogSpurMultiWindowBrowser\VMClass openCogitMultiWindowBrowser' withCRs]]]! - (Utilities classPool at: #CommonRequestStrings ifAbsent: []) ifNotNil: - [:commonRequestStringHolder| - (commonRequestStringHolder contents asString includesSubstring: 'VMClass open') ifFalse: - [Utilities appendToCommonRequests: '-\VMMaker generateConfiguration\VMMaker generateAllConfigurationsUnderVersionControl\VMMaker generateAllSpurConfigurations\VMClass openCogMultiWindowBrowser\VMClass openObjectMemoriesInterpretersBrowser\VMClass openSpurMultiWindowBrowser\VMClass openCogSpurMultiWindowBrowser\VMClass openCogitMultiWindowBrowser' withCRs]]. - ExpensiveAsserts := false! Item was changed: ----- Method: VMMaker class>>initialize (in category 'initialisation') ----- initialize "VMMaker initialize" DirNames := Dictionary new. DirNames at: #coreVMDir put: 'vm'; at: #platformsDir put: 'platforms'; at: #pluginsDir put: 'plugins'; at: #sourceDir put: 'src'. "Try and decide where the Cog source tree is. Two configurations are likely. One is that the VMMaker image is running in the image directory in the source tree and hence everything will be at '..'. Another is where the source tree is at the same level as the VMMaker image, in which case it is likely called oscogvm or Cog." #('../platforms' 'oscogvm/platforms' 'Cog/platforms' '../oscogvm/platforms') with: #('..' 'oscogvm' 'Cog' '../oscogvm') + do: ((Smalltalk classNamed: #FileSystem) + ifNotNil: + [[:dir :path| + (FileLocator cwd / dir) isDirectory ifTrue: + [DirNames at: #sourceTree put: path. + ^self]]] + ifNil: + [[:dir :path| + (FileDirectory default directoryExists: dir) ifTrue: + [DirNames at: #sourceTree put: path. + ^self]]])! - do: [:dir :path| - (FileDirectory default directoryExists: dir) ifTrue: - [DirNames at: #sourceTree put: path. - ^self]]! Item was added: + ----- Method: VMMakerDecompilerTests>>decompilerFailures (in category 'utilities') ----- + decompilerFailures + "Here is the list of failures: either a syntax error, a hard error or some failure to decompile correctly. + Collected via + DecompilerTestFailuresCollector new computeFailures." + + "class name, selector, error class name or nil" + ^ #( + #(BitBltSimulator primitive:parameters:receiver: ResumableTestFailure) "expr ifTrue: [^foo] ifFalse: [bar] => expr ifTrue: [^foo]. bar" + ) + + ! Item was removed: - ----- Method: VMMakerTool>>findPlatformsPathFrom: (in category 'path access') ----- - findPlatformsPathFrom: fd - | path | - Utilities informUserDuring:[:bar| - path := self findPlatformsPathFrom: fd informing: bar. - ]. - ^path!

1 0

VM Maker: VMMaker.oscog-AlistairGrant.2427.mcz
by commits＠source.squeak.org 13 Aug '18

13 Aug '18

Alistair Grant uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-AlistairGrant.2427.mcz ==================== Summary ==================== Name: VMMaker.oscog-AlistairGrant.2427 Author: AlistairGrant Time: 13 August 2018, 9:46:56.59943 pm UUID: 36e9946a-6f6e-461b-89e8-f290e50dd097 Ancestors: VMMaker.oscog-AlistairGrant.2426 274: Update primitiveFileStdioHandles error handling. Previously validMask = -1 was considered an error. Now validMask < 0 is considered an error and the value is returned to the image with primitiveFailForOSError(). This is more robust against word length in the VM and provides a general mechanism for the plugin to provide error information back to the image. =============== Diff against VMMaker.oscog-AlistairGrant.2426 =============== Item was changed: ----- Method: FilePlugin>>primitiveFileStdioHandles (in category 'file primitives') ----- primitiveFileStdioHandles "Answer an Array of file handles for standard in, standard out and standard error, with nil in entries that are unvailable, e.g. because the platform does not provide + standard error, etc. Fail if an error occurs determining the stdio handles, - standard error, etc. Fail if there are no standard i/o facilities on the platform or if the security plugin denies access or if memory runs out." | fileRecords result validMask | <export: true> <var: 'fileRecords' declareC: 'SQFile fileRecords[3]'> sHFAfn ~= 0 ifTrue: [(self cCode: ' ((sqInt (*)(void))sHFAfn)()' inSmalltalk: [true]) ifFalse: [^interpreterProxy primitiveFailFor: PrimErrUnsupported]]. self cCode: '' inSmalltalk: [fileRecords := Array new: 3]. validMask := self sqFileStdioHandlesInto: fileRecords. + validMask < 0 ifTrue: + [^interpreterProxy primitiveFailForOSError: validMask]. - validMask = -1 ifTrue: - [^interpreterProxy primitiveFail]. result := interpreterProxy instantiateClass: interpreterProxy classArray indexableSize: 3. result = nil ifTrue: [^interpreterProxy primitiveFailFor: PrimErrNoMemory]. interpreterProxy pushRemappableOop: result. 0 to: 2 do: [:index| (validMask bitAnd: (1 << index)) ~= 0 ifTrue: [result := interpreterProxy instantiateClass: interpreterProxy classByteArray indexableSize: self fileRecordSize. result = nil ifTrue: [interpreterProxy popRemappableOop. ^interpreterProxy primitiveFailFor: PrimErrNoMemory]. interpreterProxy storePointer: index ofObject: interpreterProxy topRemappableOop withValue: result. self cCode: [self mem: (interpreterProxy firstIndexableField: result) cp: (self addressOf: (fileRecords at: index)) y: self fileRecordSize] inSmalltalk: [(interpreterProxy firstIndexableField: result) unitSize: interpreterProxy wordSize; at: 0 put: (fileRecords at: index + 1)]]]. "In the non-Spur threaded VM ensure the handles are old, so that sqFileReadIntoAt is unaffected by incremental GCs. See platforms/Cross/plugins/FilePlugin/sqFilePluginBasicPrims.c. The Spur VM uses pinning, so it doesn't need the GC." self cppIf: COGMTVM ifTrue: [self cppIf: SPURVM ifTrue: [] ifFalse: [interpreterProxy fullGC]]. result := interpreterProxy popRemappableOop. interpreterProxy methodReturnValue: result!

1 0

[OpenSmalltalk/opensmalltalk-vm] 2cdedc: Add a few more ignorable files for the image direc...
by GitHub 13 Aug '18

13 Aug '18

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 2cdedc4ad7d7a36549942002aac3eb71b77d8f1e https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/2cdedc4ad7d7a36549… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2018-08-13 (Mon, 13 Aug 2018) Changed paths: M .gitignore Log Message: ----------- Add a few more ignorable files for the image directory. **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/ Functionality will be removed from GitHub.com on January 31st, 2019.

1 0

VM Maker: VMMaker.oscog-AlistairGrant.2426.mcz
by commits＠source.squeak.org 13 Aug '18

13 Aug '18

Alistair Grant uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-AlistairGrant.2426.mcz ==================== Summary ==================== Name: VMMaker.oscog-AlistairGrant.2426 Author: AlistairGrant Time: 9 August 2018, 11:19:34.875976 pm UUID: f47080d3-d374-4ae7-a639-8eb41af95f0e Ancestors: VMMaker.oscog-cb.2425 274: primitiveFileStdioHandles() fails to return nil if stdio file is not available Modify FilePlugin>>primitiveFileStdioHandles to treat validMask = 0 as successfully determining that no stdio streams are available. Previously validMask = 0 would result in the primitive failing with Unsupported. However having no stdio streams available is normal on Windows, and so shouldn't signal an error. sqFileStdioHandlesInto() can either return -1 to signal an unspecified error or use primitiveFailFor() or primitiveFailForOSError() to specify an error. =============== Diff against VMMaker.oscog-cb.2425 =============== Item was changed: ----- Method: FilePlugin>>primitiveFileStdioHandles (in category 'file primitives') ----- primitiveFileStdioHandles "Answer an Array of file handles for standard in, standard out and standard error, with nil in entries that are unvailable, e.g. because the platform does not provide standard error, etc. Fail if there are no standard i/o facilities on the platform or if the security plugin denies access or if memory runs out." | fileRecords result validMask | <export: true> <var: 'fileRecords' declareC: 'SQFile fileRecords[3]'> sHFAfn ~= 0 ifTrue: [(self cCode: ' ((sqInt (*)(void))sHFAfn)()' inSmalltalk: [true]) ifFalse: [^interpreterProxy primitiveFailFor: PrimErrUnsupported]]. self cCode: '' inSmalltalk: [fileRecords := Array new: 3]. validMask := self sqFileStdioHandlesInto: fileRecords. + validMask = -1 ifTrue: + [^interpreterProxy primitiveFail]. - validMask = 0 ifTrue: - [^interpreterProxy primitiveFailFor: PrimErrUnsupported]. result := interpreterProxy instantiateClass: interpreterProxy classArray indexableSize: 3. result = nil ifTrue: [^interpreterProxy primitiveFailFor: PrimErrNoMemory]. interpreterProxy pushRemappableOop: result. 0 to: 2 do: [:index| (validMask bitAnd: (1 << index)) ~= 0 ifTrue: [result := interpreterProxy instantiateClass: interpreterProxy classByteArray indexableSize: self fileRecordSize. result = nil ifTrue: [interpreterProxy popRemappableOop. ^interpreterProxy primitiveFailFor: PrimErrNoMemory]. interpreterProxy storePointer: index ofObject: interpreterProxy topRemappableOop withValue: result. self cCode: [self mem: (interpreterProxy firstIndexableField: result) cp: (self addressOf: (fileRecords at: index)) y: self fileRecordSize] inSmalltalk: [(interpreterProxy firstIndexableField: result) unitSize: interpreterProxy wordSize; at: 0 put: (fileRecords at: index + 1)]]]. "In the non-Spur threaded VM ensure the handles are old, so that sqFileReadIntoAt is unaffected by incremental GCs. See platforms/Cross/plugins/FilePlugin/sqFilePluginBasicPrims.c. The Spur VM uses pinning, so it doesn't need the GC." self cppIf: COGMTVM ifTrue: [self cppIf: SPURVM ifTrue: [] ifFalse: [interpreterProxy fullGC]]. result := interpreterProxy popRemappableOop. interpreterProxy methodReturnValue: result!

1 0

[OpenSmalltalk/opensmalltalk-vm] 274 primitiveFileStdioHandles() fails to return nil if stdio file is … (#276)
by akgrant43 13 Aug '18

13 Aug '18

…not available According to the comment for primitiveFileStdioHandles(): Answer an Array of file handles for standard in, standard out and standard error, with nil in entries that are unvailable, e.g. because the platform does not provide standard error, etc. However, on Windows in practice an array of sqFile entries with null handles is returned. The image is unable to distinguish between valid and invalid entries since sqFile is private to the VM. - Modify sqWin32FilePrims.c() to set the valid mask correctly. - Modify primitiveFileStdioHandles() to treat a mask of 0 as successfully determining that no stdio is available (a normal case on Windows). A validMask of -1 is treated as an error. - Update comments to reflect changed behaviour You can view, comment on, or merge this pull request online at: https://github.com/OpenSmalltalk/opensmalltalk-vm/pull/276 -- Commit Summary -- * 274 primitiveFileStdioHandles() fails to return nil if stdio file is not available -- File Changes -- M platforms/Cross/plugins/FilePlugin/sqFilePluginBasicPrims.c (12) M platforms/RiscOS/plugins/FilePlugin/sqFilePluginBasicPrims.c (11) M platforms/win32/plugins/FilePlugin/sqWin32FilePrims.c (31) M src/plugins/FilePlugin/FilePlugin.c (28) -- Patch Links -- https://github.com/OpenSmalltalk/opensmalltalk-vm/pull/276.patch https://github.com/OpenSmalltalk/opensmalltalk-vm/pull/276.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/OpenSmalltalk/opensmalltalk-vm/pull/276

2 6

[OpenSmalltalk/opensmalltalk-vm] 2f9165: 274 primitiveFileStdioHandles() fails to return ni...
by GitHub 13 Aug '18

13 Aug '18

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 2f91655ba5c449dc5b6da19b1d66251ab3d27908 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/2f91655ba5c449dc5b… Author: AlistairGrant <akgrant0710(a)gmail.com> Date: 2018-08-12 (Sun, 12 Aug 2018) Changed paths: M platforms/Cross/plugins/FilePlugin/sqFilePluginBasicPrims.c M platforms/RiscOS/plugins/FilePlugin/sqFilePluginBasicPrims.c M platforms/win32/plugins/FilePlugin/sqWin32FilePrims.c M src/plugins/FilePlugin/FilePlugin.c Log Message: ----------- 274 primitiveFileStdioHandles() fails to return nil if stdio file is not available According to the comment for primitiveFileStdioHandles(): Answer an Array of file handles for standard in, standard out and standard error, with nil in entries that are unvailable, e.g. because the platform does not provide standard error, etc. However, on Windows in practice an array of sqFile entries with null handles is returned. The image is unable to distinguish between valid and invalid entries since sqFile is private to the VM. - Modify sqWin32FilePrims.c() to set the valid mask correctly. - Modify primitiveFileStdioHandles() to treat a mask of 0 as successfully determining that no stdio is available (a normal case on Windows). A validMask of -1 is treated as an error. - Update comments to reflect changed behaviour Commit: a0869bef41032f2586c60de6ca73d0aeb9aa0478 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/a0869bef41032f2586… Author: akgrant43 <akgrant(a)gmail.com> Date: 2018-08-13 (Mon, 13 Aug 2018) Changed paths: M platforms/Cross/plugins/FilePlugin/sqFilePluginBasicPrims.c M platforms/RiscOS/plugins/FilePlugin/sqFilePluginBasicPrims.c M platforms/win32/plugins/FilePlugin/sqWin32FilePrims.c M src/plugins/FilePlugin/FilePlugin.c Log Message: ----------- Merge pull request #276 from akgrant43/Issue274 274 primitiveFileStdioHandles() fails to return nil if stdio file is not available Compare: https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/a28a7546d6dc...a0… **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/ Functionality will be removed from GitHub.com on January 31st, 2019.

1 0

vmmaker plugin generator issues?
by Alistair Grant 10 Aug '18

10 Aug '18

Hi Everyone, I've just generated the FilePlugin for the first time and some of the differences in the generated code to the previous version are unexpected: #if !defined(COGMTVM) /* Allow this to be overridden on the compiler command line */ -# define COGMTVM 0 +# define COGMTVM null #endif #define DirBadPath 2 #define DirNoMoreEntries 1 #if !defined(PharoVM) /* Allow this to be overridden on the compiler command line */ -# define PharoVM 0 +# define PharoVM null #endif #define PrimErrBadArgument 3 #define PrimErrBadIndex 4 @@ -51,7 +51,7 @@ static char __buildInfo[] = "FilePlugin VMMaker.oscog-VB.2383 uuid: a0681b83-711 #define PrimErrUnsupported 7 #define PrimNoErr 0 #if !defined(SPURVM) /* Allow this to be overridden on the compiler command line */ -# define SPURVM 1 +# define SPURVM null #endif Should I expect macros that were previously assigned a value of 0 or 1 are now assigned null? Also, the VMMakerTool gave the following warnings which I don't remember previously: warning, signature of InterpreterProxy>>characterTable does not match reference implementation. warning, signature of InterpreterProxy>>fullGC does not match reference implementation. warning, signature of InterpreterProxy>>instantiateClass:indexableSize: does not match reference implementation. warning, signature of InterpreterProxy>>pop:thenPush: does not match reference implementation. warning, signature of InterpreterProxy>>positive32BitValueOf: does not match reference implementation. warning, signature of InterpreterProxy>>pushRemappableOop: does not match reference implementation. internal plugin FilePlugin generated as FilePlugin 10 August 2018 8:54:39 am OS: Ubuntu 16.04 Image (generated with buildspurtrunkvmmaker64image.sh): Squeak5.2alpha latest update: #18167 Current Change Set: Unnamed1 Image format 68021 (64 bit) VMMaker.oscog-eem.2424 (plus my changes to FilePlugin) Thanks, Alistair

2 2

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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev August 2018