Vm-dev November 2014

vm-dev@lists.squeakfoundation.org

36 participants
165 discussions

VM Maker: VMMaker.oscog-eem.946.mcz
by commits＠source.squeak.org 20 Nov '14

20 Nov '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.946.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.946 Author: eem Time: 19 November 2014, 10:51:08.302 pm UUID: cdb491d7-dbc3-4758-82fb-f77bab8ce8d5 Ancestors: VMMaker.oscog-eem.945 Fix CArray>>at:put: for 64-bits. Implement sizeof: in InterpreterPlugin to handle SQFile and squeakFileOffsetType. Nuke FilePluginSImulator implementation. Use numBytesOf: in signed32BitValueOf:. Fix 64-bit storeFloatAt:from:. Fix slip in 64-bit setFormatOf:to: Fix convertFloatsToPlatformOrder. Fix SmallInteger class>>ccgCanConvertFrom: for 64 bits. Simulator now starts up Spur 64-bit image, drawing entire display correctly. =============== Diff against VMMaker.oscog-eem.945 =============== Item was changed: ----- Method: CArray>>at: (in category 'accessing') ----- at: offset | ptrAddress | ptrAddress := self ptrAddress. unitSize = 1 ifTrue: [^ interpreter byteAt: ptrAddress + offset]. unitSize = 2 ifTrue: [^ interpreter shortAt: ptrAddress + (offset * 2)]. unitSize = 4 ifTrue: [^ interpreter long32At: ptrAddress + (offset * 4)]. + unitSize = 8 ifTrue: [^ interpreter long64At: ptrAddress + (offset * 8)]. self halt: 'Can''t handle unitSize ', unitSize printString! Item was changed: ----- Method: CArray>>at:put: (in category 'accessing') ----- at: offset put: val | ptrAddress | ptrAddress := self ptrAddress. unitSize = 1 ifTrue: [^ interpreter byteAt: ptrAddress + offset put: val]. unitSize = 2 ifTrue: [^ interpreter byteAt: ptrAddress + (offset * 2) put: val]. unitSize = 4 ifTrue: [^ interpreter long32At: ptrAddress + (offset * 4) put: val]. + unitSize = 8 ifTrue: [^ interpreter long64At: ptrAddress + (offset * 8) put: val]. self halt: 'Can''t handle unitSize ', unitSize printString! Item was removed: - ----- Method: FilePluginSimulator>>sizeof: (in category 'simulation') ----- - sizeof: objectSymbolOrClass - "In the simulator file handles are just integer indices into openFiles and so need only be BytesPerWord big. We assume the file offset type is always 64-bit" - | index | - index := #( #SQFile #squeakFileOffsetType) - indexOf: objectSymbolOrClass - ifAbsent: [^super sizeof: objectSymbolOrClass]. - ^{interpreterProxy wordSize. - 8 } at: index! Item was added: + ----- Method: InterpreterPlugin>>sizeof: (in category 'simulation support') ----- + sizeof: objectSymbolOrClass + <doNotGenerate> + "In the simulator file handles are just integer indices into openFiles and so need only be BytesPerWord big. + But in the actual VM they are 5 words long. We assume the file offset type is always 64-bit" + objectSymbolOrClass == #SQFile ifTrue: + [^interpreterProxy wordSize * 5]. + objectSymbolOrClass == #squeakFileOffsetType ifTrue: + [^8]. + ^super sizeof: objectSymbolOrClass! Item was changed: ----- Method: InterpreterPrimitives>>signed32BitValueOf: (in category 'primitive support') ----- signed32BitValueOf: oop "Convert the given object into an integer value. The object may be either a positive SmallInteger or a four-byte LargeInteger." | value negative ok | <inline: false> <returnTypeC: #int> <var: #value type: #int> (objectMemory isIntegerObject: oop) ifTrue: [^objectMemory integerValueOf: oop]. (objectMemory isNonIntegerImmediate: oop) ifTrue: [^self primitiveFail]. ok := objectMemory isClassOfNonImm: oop equalTo: (objectMemory splObj: ClassLargePositiveInteger) compactClassIndex: ClassLargePositiveIntegerCompactIndex. ok ifTrue: [negative := false] ifFalse: [negative := true. ok := objectMemory isClassOfNonImm: oop equalTo: (objectMemory splObj: ClassLargeNegativeInteger) compactClassIndex: ClassLargeNegativeIntegerCompactIndex. ok ifFalse: [^self primitiveFail]]. + (objectMemory numBytesOf: oop) > 4 ifTrue: - (objectMemory lengthOf: oop) > 4 ifTrue: [^self primitiveFail]. value := (objectMemory fetchByte: 0 ofObject: oop) + ((objectMemory fetchByte: 1 ofObject: oop) << 8) + ((objectMemory fetchByte: 2 ofObject: oop) << 16) + ((objectMemory fetchByte: 3 ofObject: oop) << 24). self cCode: [] inSmalltalk: [(value anyMask: 16r80000000) ifTrue: [value := value - 16r100000000]]. "Filter out values out of range for the signed interpretation such as 16rFFFFFFFF (positive w/ bit 32 set) and -16rFFFFFFFF (negative w/ bit 32 set). Since the sign is implicit in the class we require that the high bit of the magnitude is not set which is a simple test here. Note that we have to handle the most negative 32-bit value -2147483648 specially." value < 0 ifTrue: [self assert: (self sizeof: value) == 4. "Don't fail for -16r80000000/-2147483648 Alas the simple (negative and: [value - 1 > 0]) isn't adequate since in C the result of signed integer overflow is undefined and hence under optimization this may fail. The shift, however, is well-defined." (negative and: [0 = (self cCode: [value << 1] inSmalltalk: [value << 1 bitAnd: (1 << 32) - 1])]) ifTrue: [^value]. ^self primitiveFail]. ^negative ifTrue: [0 - value] ifFalse: [value]! Item was changed: ----- Method: SmallInteger class>>ccgCanConvertFrom: (in category '*VMMaker-plugin generation') ----- ccgCanConvertFrom: anObject + ^anObject isInteger! - ^anObject class == self! Item was changed: ----- Method: Spur64BitMMLESimulator>>storeFloatAt:from: (in category 'float primitives') ----- storeFloatAt: floatBitsAddress from: aFloat + self long32At: floatBitsAddress put: (aFloat at: 2). + self long32At: floatBitsAddress+4 put: (aFloat at: 1)! - self long32At: floatBitsAddress put: (aFloat at: 1). - self long32At: floatBitsAddress+4 put: (aFloat at: 2)! Item was changed: ----- Method: Spur64BitMemoryManager>>setFormatOf:to: (in category 'header access') ----- setFormatOf: objOop to: format "0 = 0 sized objects (UndefinedObject True False et al) 1 = non-indexable objects with inst vars (Point et al) 2 = indexable objects with no inst vars (Array et al) 3 = indexable objects with inst vars (MethodContext AdditionalMethodState et al) 4 = weak indexable objects with inst vars (WeakArray et al) 5 = weak non-indexable objects with inst vars (ephemerons) (Ephemeron) 6 unused, reserved for exotic pointer objects? 7 Forwarded Object, 1st field is pointer, rest of fields are ignored 8 unused, reserved for exotic non-pointer objects? 9 (?) 64-bit indexable 10 - 11 32-bit indexable 12 - 15 16-bit indexable 16 - 23 byte indexable 24 - 31 compiled method" self assert: (format between: 0 and: self formatMask). + self longAt: objOop - objOop put: ((self longAt: objOop) bitAnd: (self formatMask << self formatShift) bitInvert64) + (format << self formatShift)! Item was changed: ----- Method: StackInterpreter>>convertFloatsToPlatformOrder (in category 'image save/restore') ----- convertFloatsToPlatformOrder "Byte-swap the words of all bytes objects in a range of the image, including Strings, ByteArrays, and CompiledMethods. This returns these objects to their original byte ordering after blindly byte-swapping the entire image. For compiled methods, byte-swap only their bytecodes part. Ensure floats are in platform-order." objectMemory vmEndianness = imageFloatsBigEndian ifTrue: [^nil]. self assert: ClassFloatCompactIndex ~= 0. objectMemory allObjectsDo: [:obj| | temp | (objectMemory compactClassIndexOf: obj) = ClassFloatCompactIndex ifTrue: + [temp := objectMemory long32At: obj + objectMemory baseHeaderSize. + objectMemory long32At: obj + objectMemory baseHeaderSize put: (objectMemory long32At: obj + objectMemory baseHeaderSize + 4). + objectMemory long32At: obj + objectMemory baseHeaderSize + 4 put: temp]]! - [temp := self longAt: obj + objectMemory baseHeaderSize. - self longAt: obj + objectMemory baseHeaderSize put: (self longAt: obj + objectMemory baseHeaderSize + 4). - self longAt: obj + objectMemory baseHeaderSize + 4 put: temp]]!

1 0

[Vm-dev] OSProcessPlugin: VMConstruction-Plugins-OSProcessPlugin.oscog-eem.49.mcz
by squeak-dev-noreply＠lists.squeakfoundation.org 20 Nov '14

20 Nov '14

Eliot Miranda uploaded a new version of VMConstruction-Plugins-OSProcessPlugin to project OSProcessPlugin: http://www.squeaksource.com/OSProcessPlugin/VMConstruction-Plugins-OSProces… ==================== Summary ==================== Name: VMConstruction-Plugins-OSProcessPlugin.oscog-eem.49 Author: eem Time: 19 November 2014, 10:44:30.962 pm UUID: dbbde2e2-9103-4ba8-96a9-33c29e7ee7e4 Ancestors: VMConstruction-Plugins-OSProcessPlugin.oscog-eem.48 Don't implement sizeof:, given it is now in InterpreterPlugin. Cog's slang doesn't require asSymbol sends anymore.

1 0

VM Maker: VMMaker.oscog-eem.945.mcz
by commits＠source.squeak.org 20 Nov '14

20 Nov '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.945.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.945 Author: eem Time: 19 November 2014, 9:49:43.751 pm UUID: 8fea87e3-42d1-45d9-8f11-d49d0c9edccc Ancestors: VMMaker.oscog-eem.944 Fix new primitiveBitShift (primitiveFailed => primitiveFail). Fix integerObjectOfCharacterObject: for 64-bits. Add bitInvert64. Fix mem:mo:ve: for 64-bits. Fix error in reverseDisplayFrom:to: Use dsame leak checker for 64-bits as 32-bits. =============== Diff against VMMaker.oscog-eem.944 =============== Item was removed: - ----- Method: CCodeGenerator>>generateBitInvert32:on:indent: (in category 'C translation') ----- - generateBitInvert32: msgNode on: aStream indent: level - "Generate the C code for this message onto the given stream." - - aStream nextPut: $~. - self emitCExpression: msgNode receiver on: aStream! Item was added: + ----- Method: CCodeGenerator>>generateBitInvert:on:indent: (in category 'C translation') ----- + generateBitInvert: msgNode on: aStream indent: level + "Generate the C code for this message onto the given stream." + + aStream nextPut: $~. + self emitCExpression: msgNode receiver on: aStream! Item was changed: ----- Method: CCodeGenerator>>initializeCTranslationDictionary (in category 'C translation') ----- initializeCTranslationDictionary "Initialize the dictionary mapping message names to actions for C code generation." | pairs | translationDict := Dictionary new: 200. pairs := #( #& #generateAnd:on:indent: #| #generateOr:on:indent: #and: #generateSequentialAnd:on:indent: #or: #generateSequentialOr:on:indent: #not #generateNot:on:indent: #+ #generatePlus:on:indent: #- #generateMinus:on:indent: #negated #generateNegated:on:indent: #* #generateTimes:on:indent: #/ #generateDivide:on:indent: #// #generateDivide:on:indent: #\\ #generateModulo:on:indent: #<< #generateShiftLeft:on:indent: #>> #generateShiftRight:on:indent: #min: #generateMin:on:indent: #max: #generateMax:on:indent: #between:and: #generateBetweenAnd:on:indent: #bitAnd: #generateBitAnd:on:indent: #bitOr: #generateBitOr:on:indent: #bitXor: #generateBitXor:on:indent: #bitShift: #generateBitShift:on:indent: #signedBitShift: #generateSignedBitShift:on:indent: + #bitInvert32 #generateBitInvert:on:indent: + #bitInvert64 #generateBitInvert:on:indent: - #bitInvert32 #generateBitInvert32:on:indent: #bitClear: #generateBitClear:on:indent: #truncateTo: #generateTruncateTo:on:indent: #rounded #generateRounded:on:indent: #< #generateLessThan:on:indent: #<= #generateLessThanOrEqual:on:indent: #= #generateEqual:on:indent: #> #generateGreaterThan:on:indent: #>= #generateGreaterThanOrEqual:on:indent: #~= #generateNotEqual:on:indent: #== #generateEqual:on:indent: #~~ #generateNotEqual:on:indent: #isNil #generateIsNil:on:indent: #notNil #generateNotNil:on:indent: #whileTrue: #generateWhileTrue:on:indent: #whileFalse: #generateWhileFalse:on:indent: #whileTrue #generateDoWhileTrue:on:indent: #whileFalse #generateDoWhileFalse:on:indent: #to:do: #generateToDo:on:indent: #to:by:do: #generateToByDo:on:indent: #repeat #generateRepeat:on:indent: #ifTrue: #generateIfTrue:on:indent: #ifFalse: #generateIfFalse:on:indent: #ifTrue:ifFalse: #generateIfTrueIfFalse:on:indent: #ifFalse:ifTrue: #generateIfFalseIfTrue:on:indent: #ifNotNil: #generateIfNotNil:on:indent: #ifNil: #generateIfNil:on:indent: #ifNotNil:ifNil: #generateIfNotNilIfNil:on:indent: #ifNil:ifNotNil: #generateIfNilIfNotNil:on:indent: #at: #generateAt:on:indent: #at:put: #generateAtPut:on:indent: #basicAt: #generateAt:on:indent: #basicAt:put: #generateAtPut:on:indent: #integerValueOf: #generateIntegerValueOf:on:indent: #integerObjectOf: #generateIntegerObjectOf:on:indent: #isIntegerObject: #generateIsIntegerObject:on:indent: #cCode: #generateInlineCCode:on:indent: #cCode:inSmalltalk: #generateInlineCCode:on:indent: #cPreprocessorDirective: #generateInlineCPreprocessorDirective:on:indent: #cppIf:ifTrue:ifFalse: #generateInlineCppIfElse:on:indent: #cppIf:ifTrue: #generateInlineCppIfElse:on:indent: #cCoerce:to: #generateCCoercion:on:indent: #cCoerceSimple:to: #generateCCoercion:on:indent: #addressOf: #generateAddressOf:on:indent: #addressOf:put: #generateAddressOf:on:indent: #asAddress:put: #generateAsAddress:on:indent: #signedIntFromLong #generateSignedIntFromLong:on:indent: #signedIntToLong #generateSignedIntToLong:on:indent: #signedIntFromShort #generateSignedIntFromShort:on:indent: #signedIntToShort #generateSignedIntToShort:on:indent: #preIncrement #generatePreIncrement:on:indent: #preDecrement #generatePreDecrement:on:indent: #inline: #generateInlineDirective:on:indent: #asFloat #generateAsFloat:on:indent: #asInteger #generateAsInteger:on:indent: #asUnsignedInteger #generateAsUnsignedInteger:on:indent: #asLong #generateAsLong:on:indent: #asUnsignedLong #generateAsUnsignedLong:on:indent: #asVoidPointer #generateAsVoidPointer:on:indent: #asSymbol #generateAsSymbol:on:indent: #flag: #generateFlag:on:indent: #anyMask: #generateBitAnd:on:indent: #noMask: #generateNoMask:on:indent: #raisedTo: #generateRaisedTo:on:indent: #touch: #generateTouch:on:indent: #bytesPerOop #generateBytesPerOop:on:indent: #bytesPerWord #generateBytesPerWord:on:indent: #wordSize #generateBytesPerWord:on:indent: #baseHeaderSize #generateBaseHeaderSize:on:indent: #minSmallInteger #generateSmallIntegerConstant:on:indent: #maxSmallInteger #generateSmallIntegerConstant:on:indent: #sharedCodeNamed:inCase: #generateSharedCodeDirective:on:indent: #perform: #generatePerform:on:indent: #perform:with: #generatePerform:on:indent: #perform:with:with: #generatePerform:on:indent: #perform:with:with:with: #generatePerform:on:indent: #perform:with:with:with:with: #generatePerform:on:indent: #perform:with:with:with:with:with: #generatePerform:on:indent: #value #generateValue:on:indent: #value: #generateValue:on:indent: #value:value: #generateValue:on:indent: #value:value:value: #generateValue:on:indent: #deny: #generateDeny:on:indent: #shouldNotImplement #generateSmalltalkMetaError:on:indent: #shouldBeImplemented #generateSmalltalkMetaError:on:indent: #subclassResponsibility #generateSmalltalkMetaError:on:indent: ). 1 to: pairs size by: 2 do: [:i | translationDict at: (pairs at: i) put: (pairs at: i + 1)]. pairs := #( #ifTrue: #generateIfTrueAsArgument:on:indent: #ifFalse: #generateIfFalseAsArgument:on:indent: #ifTrue:ifFalse: #generateIfTrueIfFalseAsArgument:on:indent: #ifFalse:ifTrue: #generateIfFalseIfTrueAsArgument:on:indent: #ifNotNil: #generateIfNotNilAsArgument:on:indent: #ifNil: #generateIfNilAsArgument:on:indent: #ifNotNil:ifNil: #generateIfNotNilIfNilAsArgument:on:indent: #ifNil:ifNotNil: #generateIfNilIfNotNilAsArgument:on:indent: #cCode: #generateInlineCCodeAsArgument:on:indent: #cCode:inSmalltalk: #generateInlineCCodeAsArgument:on:indent: #cppIf:ifTrue:ifFalse: #generateInlineCppIfElseAsArgument:on:indent: #cppIf:ifTrue: #generateInlineCppIfElseAsArgument:on:indent: #value #generateValueAsArgument:on:indent: #value: #generateValueAsArgument:on:indent: #value:value: #generateValueAsArgument:on:indent: ). asArgumentTranslationDict := Dictionary new: 8. 1 to: pairs size by: 2 do: [:i | asArgumentTranslationDict at: (pairs at: i) put: (pairs at: i + 1)]. ! Item was added: + ----- Method: Integer>>bitInvert64 (in category '*VMMaker-bit manipulation') ----- + bitInvert64 + "Answer the 64-bit complement of the receiver." + + ^self bitXor: 16rFFFFFFFFFFFFFFFF! Item was changed: ----- Method: InterpreterPrimitives>>primitiveBitShift (in category 'arithmetic integer primitives') ----- primitiveBitShift | integerReceiver integerArgument shifted | integerArgument := self stackTop. (objectMemory isIntegerObject: integerArgument) ifFalse: + [^self primitiveFail]. - [^self primitiveFailed]. integerReceiver := self stackValue: 1. objectMemory wordSize = 4 ifTrue: [integerReceiver := self positive32BitValueOf: integerReceiver] ifFalse: [integerReceiver := self signed64BitValueOf: integerReceiver]. self successful ifTrue: [(integerArgument := objectMemory integerValueOf: integerArgument) >= 0 ifTrue: "Left shift -- must fail if we lose bits beyond 32" [integerArgument <= objectMemory numSmallIntegerBits ifFalse: + [^self primitiveFail]. - [^self primitiveFailed]. shifted := integerReceiver << integerArgument. (shifted >> integerArgument) = integerReceiver ifFalse: + [^self primitiveFail]] - [^self primitiveFailed]] ifFalse: "Right shift -- OK to lose bits" [integerArgument >= objectMemory numSmallIntegerBits negated ifFalse: + [^self primitiveFail]. - [^self primitiveFailed]. shifted := integerReceiver >> (0 - integerArgument)]. shifted := (objectMemory isIntegerValue: shifted) ifTrue: [objectMemory integerObjectOf: shifted] ifFalse: [objectMemory wordSize = 4 ifTrue: [self positive32BitIntegerFor: shifted] ifFalse: [self signed64BitIntegerFor: shifted]]. self pop: 2 thenPush: shifted]! Item was added: + ----- Method: Spur32BitMemoryManager>>integerObjectOfCharacterObject: (in category 'immediates') ----- + integerObjectOfCharacterObject: oop + "Immediate characters are unsigned" + ^(self cCoerceSimple: oop to: #'unsigned long') >> 1! Item was added: + ----- Method: Spur64BitMemoryManager>>integerObjectOfCharacterObject: (in category 'immediates') ----- + integerObjectOfCharacterObject: oop + "Immediate characters are unsigned" + ^oop - (self characterTag - self smallIntegerTag)! Item was added: + ----- Method: Spur64BitMemoryManager>>mem:mo:ve: (in category 'simulation only') ----- + mem: destAddress mo: sourceAddress ve: bytes + <doNotGenerate> + | dst src | + dst := destAddress asInteger. + src := sourceAddress asInteger. + "Emulate the c library memmove function" + self assert: bytes \\ 8 = 0. + destAddress > sourceAddress + ifTrue: + [bytes - 8 to: 0 by: -8 do: + [:i| self longAt: dst + i put: (self longAt: src + i)]] + ifFalse: + [0 to: bytes - 8 by: 8 do: + [:i| self longAt: dst + i put: (self longAt: src + i)]]! Item was changed: ----- Method: SpurMemoryManager>>initialize (in category 'initialization') ----- initialize "We can put all initializations that set something to 0 or to false here. In C all global variables are initialized to 0, and 0 is false." remapBuffer := Array new: RemapBufferSize. remapBufferCount := extraRootCount := 0. "see below" freeListsMask := totalFreeOldSpace := lowSpaceThreshold := 0. checkForLeaks := 0. needGCFlag := signalLowSpace := scavengeInProgress := marking := false. becomeEffectsFlags := 0. statScavenges := statIncrGCs := statFullGCs := 0. statScavengeGCUsecs := statIncrGCUsecs := statFullGCUsecs := statGCEndUsecs := 0. statSGCDeltaUsecs := statIGCDeltaUsecs := statFGCDeltaUsecs := 0. statGrowMemory := statShrinkMemory := statRootTableCount := statSurvivorCount := 0. statRootTableOverflows := statMarkCount := statSpecialMarkCount := statCompactPassCount := statCoalesces := 0. "We can initialize things that are allocated but are lazily initialized." unscannedEphemerons := SpurContiguousObjStack new. "we can initialize things that are virtual in C." scavenger := SpurGenerationScavengerSimulator new manager: self; yourself. segmentManager := SpurSegmentManager new manager: self; yourself. "We can also initialize here anything that is only for simulation." + heapMap := CogCheck32BitHeapMap new. - heapMap := self wordSize = 4 ifTrue: [CogCheck32BitHeapMap new]. "N.B. We *don't* initialize extraRoots because we don't simulate it."! Item was changed: ----- Method: SpurMemoryManager>>integerObjectOfCharacterObject: (in category 'immediates') ----- integerObjectOfCharacterObject: oop + self subclassResponsibility! - "Immediate characters are unsigned" - ^(self cCoerceSimple: oop to: #'unsigned long') >> 1! Item was added: + ----- Method: SpurMemoryManager>>smallIntegerTag (in category 'cog jit support') ----- + smallIntegerTag + ^1! Item was changed: ----- Method: StackInterpreter>>reverseDisplayFrom:to: (in category 'I/O primitive support') ----- reverseDisplayFrom: startIndex to: endIndex "Reverse the given range of Display words (at different bit depths, this will reverse different numbers of pixels). Used to give feedback during VM activities such as garbage collection when debugging. It is assumed that the given word range falls entirely within the first line of the Display." | displayObj displayBits w wordStartIndex wordEndIndex primFailCodeValue | displayObj := objectMemory splObj: TheDisplay. ((objectMemory isPointers: displayObj) and: [(objectMemory lengthOf: displayObj) >= 4]) ifFalse: [^ nil]. w := objectMemory fetchPointer: 1 ofObject: displayObj. displayBits := objectMemory fetchPointer: 0 ofObject: displayObj. ((objectMemory isImmediate: displayBits) or: [(objectMemory isNonIntegerObject: w) or: [objectMemory isPointersNonImm: displayBits]]) ifTrue: [^ nil]. wordStartIndex := startIndex * 4. wordEndIndex := endIndex * 4 min: (objectMemory sizeBitsOf: displayBits). displayBits := displayBits + objectMemory baseHeaderSize. displayBits + wordStartIndex to: displayBits + wordEndIndex by: 4 do: [:ptr | | reversed | reversed := (objectMemory long32At: ptr) bitXor: 4294967295. + objectMemory long32At: ptr put: reversed]. - objectMemory longAt: ptr put: reversed]. primFailCodeValue := primFailCode. self initPrimCall. self displayBitsOf: displayObj Left: 0 Top: 0 Right: (objectMemory integerValueOf: w) Bottom: 1. self ioForceDisplayUpdate. primFailCode := primFailCodeValue!

1 0

VM Maker: VMMaker.oscog-eem.944.mcz
by commits＠source.squeak.org 20 Nov '14

20 Nov '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.944.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.944 Author: eem Time: 19 November 2014, 4:26:08.21 pm UUID: 14ad71a2-117d-4a73-b041-efb833d79f01 Ancestors: VMMaker.oscog-eem.943 Define areIntegers:and: for 64-bit Spur, and move it into the ObjectMemory hierarchies. Add maxSmallInteger and minSmallInteger and matching manifest constants. Use these in LargeIntegersPlugin and Matrix2x3Plugin. =============== Diff against VMMaker.oscog-eem.943 =============== Item was added: + ----- Method: CCodeGenerator>>generateSmallIntegerConstant:on:indent: (in category 'C translation') ----- + generateSmallIntegerConstant: aSendNode on: aStream indent: indent + aSendNode selector = #minSmallInteger ifTrue: + [^aStream nextPutAll: 'MinSmallInteger']. + aSendNode selector = #maxSmallInteger ifTrue: + [^aStream nextPutAll: 'MaxSmallInteger']. + self error: 'unknown SmallInteger constant'! Item was changed: ----- Method: CCodeGenerator>>initializeCTranslationDictionary (in category 'C translation') ----- initializeCTranslationDictionary "Initialize the dictionary mapping message names to actions for C code generation." | pairs | translationDict := Dictionary new: 200. pairs := #( #& #generateAnd:on:indent: #| #generateOr:on:indent: #and: #generateSequentialAnd:on:indent: #or: #generateSequentialOr:on:indent: #not #generateNot:on:indent: #+ #generatePlus:on:indent: #- #generateMinus:on:indent: #negated #generateNegated:on:indent: #* #generateTimes:on:indent: #/ #generateDivide:on:indent: #// #generateDivide:on:indent: #\\ #generateModulo:on:indent: #<< #generateShiftLeft:on:indent: #>> #generateShiftRight:on:indent: #min: #generateMin:on:indent: #max: #generateMax:on:indent: #between:and: #generateBetweenAnd:on:indent: #bitAnd: #generateBitAnd:on:indent: #bitOr: #generateBitOr:on:indent: #bitXor: #generateBitXor:on:indent: #bitShift: #generateBitShift:on:indent: #signedBitShift: #generateSignedBitShift:on:indent: #bitInvert32 #generateBitInvert32:on:indent: #bitClear: #generateBitClear:on:indent: #truncateTo: #generateTruncateTo:on:indent: #rounded #generateRounded:on:indent: #< #generateLessThan:on:indent: #<= #generateLessThanOrEqual:on:indent: #= #generateEqual:on:indent: #> #generateGreaterThan:on:indent: #>= #generateGreaterThanOrEqual:on:indent: #~= #generateNotEqual:on:indent: #== #generateEqual:on:indent: #~~ #generateNotEqual:on:indent: #isNil #generateIsNil:on:indent: #notNil #generateNotNil:on:indent: #whileTrue: #generateWhileTrue:on:indent: #whileFalse: #generateWhileFalse:on:indent: #whileTrue #generateDoWhileTrue:on:indent: #whileFalse #generateDoWhileFalse:on:indent: #to:do: #generateToDo:on:indent: #to:by:do: #generateToByDo:on:indent: #repeat #generateRepeat:on:indent: #ifTrue: #generateIfTrue:on:indent: #ifFalse: #generateIfFalse:on:indent: #ifTrue:ifFalse: #generateIfTrueIfFalse:on:indent: #ifFalse:ifTrue: #generateIfFalseIfTrue:on:indent: #ifNotNil: #generateIfNotNil:on:indent: #ifNil: #generateIfNil:on:indent: #ifNotNil:ifNil: #generateIfNotNilIfNil:on:indent: #ifNil:ifNotNil: #generateIfNilIfNotNil:on:indent: #at: #generateAt:on:indent: #at:put: #generateAtPut:on:indent: #basicAt: #generateAt:on:indent: #basicAt:put: #generateAtPut:on:indent: #integerValueOf: #generateIntegerValueOf:on:indent: #integerObjectOf: #generateIntegerObjectOf:on:indent: #isIntegerObject: #generateIsIntegerObject:on:indent: #cCode: #generateInlineCCode:on:indent: #cCode:inSmalltalk: #generateInlineCCode:on:indent: #cPreprocessorDirective: #generateInlineCPreprocessorDirective:on:indent: #cppIf:ifTrue:ifFalse: #generateInlineCppIfElse:on:indent: #cppIf:ifTrue: #generateInlineCppIfElse:on:indent: #cCoerce:to: #generateCCoercion:on:indent: #cCoerceSimple:to: #generateCCoercion:on:indent: #addressOf: #generateAddressOf:on:indent: #addressOf:put: #generateAddressOf:on:indent: #asAddress:put: #generateAsAddress:on:indent: #signedIntFromLong #generateSignedIntFromLong:on:indent: #signedIntToLong #generateSignedIntToLong:on:indent: #signedIntFromShort #generateSignedIntFromShort:on:indent: #signedIntToShort #generateSignedIntToShort:on:indent: #preIncrement #generatePreIncrement:on:indent: #preDecrement #generatePreDecrement:on:indent: #inline: #generateInlineDirective:on:indent: #asFloat #generateAsFloat:on:indent: #asInteger #generateAsInteger:on:indent: #asUnsignedInteger #generateAsUnsignedInteger:on:indent: #asLong #generateAsLong:on:indent: #asUnsignedLong #generateAsUnsignedLong:on:indent: #asVoidPointer #generateAsVoidPointer:on:indent: #asSymbol #generateAsSymbol:on:indent: #flag: #generateFlag:on:indent: #anyMask: #generateBitAnd:on:indent: #noMask: #generateNoMask:on:indent: #raisedTo: #generateRaisedTo:on:indent: #touch: #generateTouch:on:indent: #bytesPerOop #generateBytesPerOop:on:indent: #bytesPerWord #generateBytesPerWord:on:indent: #wordSize #generateBytesPerWord:on:indent: #baseHeaderSize #generateBaseHeaderSize:on:indent: + #minSmallInteger #generateSmallIntegerConstant:on:indent: + #maxSmallInteger #generateSmallIntegerConstant:on:indent: #sharedCodeNamed:inCase: #generateSharedCodeDirective:on:indent: #perform: #generatePerform:on:indent: #perform:with: #generatePerform:on:indent: #perform:with:with: #generatePerform:on:indent: #perform:with:with:with: #generatePerform:on:indent: #perform:with:with:with:with: #generatePerform:on:indent: #perform:with:with:with:with:with: #generatePerform:on:indent: #value #generateValue:on:indent: #value: #generateValue:on:indent: #value:value: #generateValue:on:indent: #value:value:value: #generateValue:on:indent: #deny: #generateDeny:on:indent: #shouldNotImplement #generateSmalltalkMetaError:on:indent: #shouldBeImplemented #generateSmalltalkMetaError:on:indent: #subclassResponsibility #generateSmalltalkMetaError:on:indent: ). 1 to: pairs size by: 2 do: [:i | translationDict at: (pairs at: i) put: (pairs at: i + 1)]. pairs := #( #ifTrue: #generateIfTrueAsArgument:on:indent: #ifFalse: #generateIfFalseAsArgument:on:indent: #ifTrue:ifFalse: #generateIfTrueIfFalseAsArgument:on:indent: #ifFalse:ifTrue: #generateIfFalseIfTrueAsArgument:on:indent: #ifNotNil: #generateIfNotNilAsArgument:on:indent: #ifNil: #generateIfNilAsArgument:on:indent: #ifNotNil:ifNil: #generateIfNotNilIfNilAsArgument:on:indent: #ifNil:ifNotNil: #generateIfNilIfNotNilAsArgument:on:indent: #cCode: #generateInlineCCodeAsArgument:on:indent: #cCode:inSmalltalk: #generateInlineCCodeAsArgument:on:indent: #cppIf:ifTrue:ifFalse: #generateInlineCppIfElseAsArgument:on:indent: #cppIf:ifTrue: #generateInlineCppIfElseAsArgument:on:indent: #value #generateValueAsArgument:on:indent: #value: #generateValueAsArgument:on:indent: #value:value: #generateValueAsArgument:on:indent: ). asArgumentTranslationDict := Dictionary new: 8. 1 to: pairs size by: 2 do: [:i | asArgumentTranslationDict at: (pairs at: i) put: (pairs at: i + 1)]. ! Item was removed: - ----- Method: Interpreter>>areIntegers:and: (in category 'utilities') ----- - areIntegers: oop1 and: oop2 - "Test oop1 and oop2 to make sure both are SmallIntegers." - ^ ((oop1 bitAnd: oop2) bitAnd: 1) ~= 0! Item was changed: ----- Method: InterpreterPrimitives>>magnitude64BitIntegerFor:neg: (in category 'primitive support') ----- magnitude64BitIntegerFor: magnitude neg: isNegative "Return a Large Integer object for the given integer magnitude and sign" | newLargeInteger largeClass intValue highWord sz isSmall smallVal | <var: 'magnitude' type: #usqLong> <var: 'highWord' type: #usqInt> isSmall := isNegative + ifTrue: [magnitude <= (objectMemory maxSmallInteger + 1)] + ifFalse: [magnitude < (objectMemory maxSmallInteger + 1)]. - ifTrue: [magnitude <= 16r40000000] - ifFalse: [magnitude < 16r40000000]. isSmall ifTrue: [smallVal := self cCoerceSimple: magnitude to: #sqInt. isNegative ifTrue: [smallVal := 0 - smallVal]. ^objectMemory integerObjectOf: smallVal]. largeClass := isNegative ifTrue: [objectMemory classLargeNegativeInteger] ifFalse: [objectMemory classLargePositiveInteger]. highWord := magnitude >> 32. highWord = 0 ifTrue: [sz := 4] ifFalse: [sz := 5. (highWord := highWord >> 8) = 0 ifFalse: [sz := sz + 1]. (highWord := highWord >> 8) = 0 ifFalse: [sz := sz + 1]. (highWord := highWord >> 8) = 0 ifFalse: [sz := sz + 1]]. newLargeInteger := objectMemory instantiateClass: largeClass indexableSize: sz. 0 to: sz-1 do: [:i | intValue := (magnitude >> (i * 8)) bitAnd: 255. objectMemory storeByte: i ofObject: newLargeInteger withValue: intValue]. ^newLargeInteger! Item was changed: ----- Method: InterpreterPrimitives>>primitiveBitShift (in category 'arithmetic integer primitives') ----- primitiveBitShift | integerReceiver integerArgument shifted | + integerArgument := self stackTop. + (objectMemory isIntegerObject: integerArgument) ifFalse: + [^self primitiveFailed]. + integerReceiver := self stackValue: 1. + objectMemory wordSize = 4 + ifTrue: + [integerReceiver := self positive32BitValueOf: integerReceiver] + ifFalse: + [integerReceiver := self signed64BitValueOf: integerReceiver]. + self successful ifTrue: + [(integerArgument := objectMemory integerValueOf: integerArgument) >= 0 + ifTrue: "Left shift -- must fail if we lose bits beyond 32" + [integerArgument <= objectMemory numSmallIntegerBits ifFalse: + [^self primitiveFailed]. + shifted := integerReceiver << integerArgument. + (shifted >> integerArgument) = integerReceiver ifFalse: + [^self primitiveFailed]] + ifFalse: "Right shift -- OK to lose bits" + [integerArgument >= objectMemory numSmallIntegerBits negated ifFalse: + [^self primitiveFailed]. + shifted := integerReceiver >> (0 - integerArgument)]. + shifted := (objectMemory isIntegerValue: shifted) + ifTrue: [objectMemory integerObjectOf: shifted] + ifFalse: + [objectMemory wordSize = 4 + ifTrue: [self positive32BitIntegerFor: shifted] + ifFalse: [self signed64BitIntegerFor: shifted]]. + self pop: 2 thenPush: shifted]! - integerArgument := self popInteger. - integerReceiver := self popPos32BitInteger. - self successful ifTrue: [ - integerArgument >= 0 ifTrue: [ - "Left shift -- must fail if we lose bits beyond 32" - self success: integerArgument <= 31. - shifted := integerReceiver << integerArgument. - self success: (shifted >> integerArgument) = integerReceiver. - ] ifFalse: [ - "Right shift -- OK to lose bits" - self success: integerArgument >= -31. - shifted := integerReceiver >> (0 - integerArgument). - ]. - ]. - self successful - ifTrue: [self push: (self positive32BitIntegerFor: shifted)] - ifFalse: [self unPop: 2]! Item was changed: ----- Method: LargeIntegersPlugin>>cDigitLengthOfCSI: (in category 'C core util') ----- cDigitLengthOfCSI: csi + "Answer the number of bytes required to represent the value of a CSmallInteger." + csi >= 0 ifTrue: + [csi < 256 ifTrue: + [^1]. + csi < 65536 ifTrue: + [^2]. + csi < 16777216 ifTrue: + [^3]. + interpreterProxy bytesPerOop = 4 + ifTrue: + [^4] + ifFalse: + [csi < 4294967296 ifTrue: + [^4]. + csi < 1099511627776 ifTrue: + [^5]. + csi < 281474976710656 ifTrue: + [^6]. + csi < 72057594037927936 ifTrue: + [^7]. + ^8]]. + csi > -256 ifTrue: + [^1]. + csi > -65536 ifTrue: + [^2]. + csi > -16777216 ifTrue: + [^3]. + interpreterProxy bytesPerOop = 4 + ifTrue: + [^4] + ifFalse: + [csi > -4294967296 ifTrue: + [^4]. + csi > -1099511627776 ifTrue: + [^5]. + csi > -281474976710656 ifTrue: + [^6]. + csi > -72057594037927936 ifTrue: + [^7]. + ^8]! - "Answer the number of indexable fields of a CSmallInteger. This value is - the same as the largest legal subscript." - (csi < 256 and: [csi > -256]) - ifTrue: [^ 1]. - (csi < 65536 and: [csi > -65536]) - ifTrue: [^ 2]. - (csi < 16777216 and: [csi > -16777216]) - ifTrue: [^ 3]. - ^ 4! Item was changed: ----- Method: LargeIntegersPlugin>>cDigitOfCSI:at: (in category 'C core util') ----- cDigitOfCSI: csi at: ix "Answer the value of an indexable field in the receiver. LargePositiveInteger uses bytes of base two number, and each is a 'digit' base 256." "ST indexed!!" + ix < 1 ifTrue: [interpreterProxy primitiveFail. ^0]. + ix > interpreterProxy bytesPerOop ifTrue: [^0]. + ^self + cCode: [(csi < 0 + ifTrue: [0 - csi] + ifFalse: [csi]) >> (ix - 1 * 8) bitAnd: 255] + inSmalltalk: [csi digitAt: ix]! - ix < 1 ifTrue: [interpreterProxy primitiveFail]. - ix > 4 ifTrue: [^ 0]. - csi < 0 - ifTrue: - [self cCode: '' - inSmalltalk: [csi = -1073741824 ifTrue: ["SmallInteger minVal" - "Can't negate minVal -- treat specially" - ^ #(0 0 0 64 ) at: ix]]. - ^ (0 - csi) >> (ix - 1 * 8) - bitAnd: 255] - ifFalse: [^ csi >> (ix - 1 * 8) - bitAnd: 255]! Item was changed: ----- Method: LargeIntegersPlugin>>createLargeFromSmallInteger: (in category 'oop util') ----- createLargeFromSmallInteger: anOop "anOop has to be a SmallInteger!!" + | val class size res pByte byte | - | val class size res pByte | <var: #pByte type: 'unsigned char * '> val := interpreterProxy integerValueOf: anOop. val < 0 ifTrue: [class := interpreterProxy classLargeNegativeInteger] ifFalse: [class := interpreterProxy classLargePositiveInteger]. size := self cDigitLengthOfCSI: val. res := interpreterProxy instantiateClass: class indexableSize: size. pByte := interpreterProxy firstIndexableField: res. + 1 to: size do: [:ix | + byte := self cDigitOfCSI: val at: ix. + pByte at: ix - 1 put: byte]. + ^res! - 1 to: size do: [:ix | pByte at: ix - 1 put: (self cDigitOfCSI: val at: ix)]. - ^ res! Item was changed: ----- Method: LargeIntegersPlugin>>isNormalized: (in category 'oop functions') ----- isNormalized: anInteger | len maxVal minVal sLen class positive | (interpreterProxy isIntegerObject: anInteger) ifTrue: [^ true]. class := interpreterProxy fetchClassOf: anInteger. (positive := class = interpreterProxy classLargePositiveInteger) ifFalse: [class = interpreterProxy classLargeNegativeInteger ifFalse: [interpreterProxy primitiveFailFor: PrimErrBadArgument. ^false]]. "Check for leading zero of LargeInteger" len := self digitLength: anInteger. len = 0 ifTrue: [^ false]. (self unsafeByteOf: anInteger at: len) = 0 ifTrue: [^ false]. "no leading zero, now check if anInteger is in SmallInteger range or not" + sLen := interpreterProxy bytesPerOop. - sLen := 4. "maximal digitLength of aSmallInteger" len > sLen ifTrue: [^ true]. len < sLen ifTrue: [^ false]. "len = sLen" positive + ifTrue: [maxVal := interpreterProxy maxSmallInteger. "SmallInteger maxVal" - ifTrue: [maxVal := 1073741823. "SmallInteger maxVal" "all bytes of maxVal but the highest one are just FF's" ^ (self unsafeByteOf: anInteger at: sLen) > (self cDigitOfCSI: maxVal at: sLen)] + ifFalse: [minVal := interpreterProxy minSmallInteger. "SmallInteger minVal" - ifFalse: [minVal := -1073741824. "SmallInteger minVal" "all bytes of minVal but the highest one are just 00's" (self unsafeByteOf: anInteger at: sLen) < (self cDigitOfCSI: minVal at: sLen) ifTrue: [^ false]. "if just one digit differs, then anInteger < minval (the corresponding digit byte is greater!!) and therefore a LargeNegativeInteger" 1 to: sLen do: [:ix | (self unsafeByteOf: anInteger at: ix) = (self cDigitOfCSI: minVal at: ix) ifFalse: [^ true]]]. ^ false! Item was changed: ----- Method: LargeIntegersPlugin>>normalizeNegative: (in category 'oop functions') ----- normalizeNegative: aLargeNegativeInteger "Check for leading zeroes and return shortened copy if so." "First establish len = significant length." | sLen val len oldLen minVal | len := oldLen := self digitLength: aLargeNegativeInteger. [len ~= 0 and: [(self unsafeByteOf: aLargeNegativeInteger at: len) = 0]] whileTrue: [len := len - 1]. len = 0 ifTrue: [^ 0 asOop: SmallInteger]. "Now check if in SmallInteger range" sLen := 4. "SmallInteger minVal digitLength" len <= sLen ifTrue: ["SmallInteger minVal" + minVal := interpreterProxy minSmallInteger. - minVal := -1073741824. (len < sLen or: [(self digitOfBytes: aLargeNegativeInteger at: sLen) < (self cDigitOfCSI: minVal at: sLen) "minVal lastDigit"]) ifTrue: ["If high digit less, then can be small" val := 0. len to: 1 by: -1 do: [:i | val := val * 256 - (self unsafeByteOf: aLargeNegativeInteger at: i)]. ^ val asOop: SmallInteger]. 1 to: sLen do: [:i | "If all digits same, then = minVal (sr: minVal digits 1 to 3 are 0)" (self digitOfBytes: aLargeNegativeInteger at: i) = (self cDigitOfCSI: minVal at: i) ifFalse: ["Not so; return self shortened" len < oldLen ifTrue: ["^ self growto: len" ^ self bytes: aLargeNegativeInteger growTo: len] ifFalse: [^ aLargeNegativeInteger]]]. ^ minVal asOop: SmallInteger]. "Return self, or a shortened copy" len < oldLen ifTrue: ["^ self growto: len" ^ self bytes: aLargeNegativeInteger growTo: len] ifFalse: [^ aLargeNegativeInteger]! Item was changed: ----- Method: LargeIntegersPlugin>>normalizePositive: (in category 'oop functions') ----- normalizePositive: aLargePositiveInteger "Check for leading zeroes and return shortened copy if so." "First establish len = significant length." | sLen val len oldLen | len := oldLen := self digitLength: aLargePositiveInteger. [len ~= 0 and: [(self unsafeByteOf: aLargePositiveInteger at: len) = 0]] whileTrue: [len := len - 1]. len = 0 ifTrue: [^ 0 asOop: SmallInteger]. "Now check if in SmallInteger range" + sLen := interpreterProxy bytesPerOop. - sLen := 4. "SmallInteger maxVal digitLength." + (len <= sLen + and: [(self digitOfBytes: aLargePositiveInteger at: sLen) + <= (self cDigitOfCSI: interpreterProxy maxSmallInteger at: sLen) - (len <= sLen and: [(self digitOfBytes: aLargePositiveInteger at: sLen) - <= (self cDigitOfCSI: 1073741823 at: sLen) "SmallInteger maxVal"]) ifTrue: ["If so, return its SmallInt value" val := 0. len to: 1 by: -1 do: [:i | val := val * 256 + (self unsafeByteOf: aLargePositiveInteger at: i)]. ^ val asOop: SmallInteger]. "Return self, or a shortened copy" len < oldLen ifTrue: ["^ self growto: len" ^ self bytes: aLargePositiveInteger growTo: len] ifFalse: [^ aLargePositiveInteger]! Item was changed: ----- Method: Matrix2x3Plugin>>okayIntValue: (in category 'private') ----- okayIntValue: value + ^(value >= interpreterProxy minSmallInteger asFloat + and: [m23ResultX <= interpreterProxy maxSmallInteger asFloat])! - ^(value >= -1073741824 asFloat and:[m23ResultX <= 1073741823 asFloat]) - ! Item was removed: - ----- Method: NewspeakInterpreter>>areIntegers:and: (in category 'utilities') ----- - areIntegers: oop1 and: oop2 - "Test oop1 and oop2 to make sure both are SmallIntegers." - ^ ((oop1 bitAnd: oop2) bitAnd: 1) ~= 0! Item was added: + ----- Method: ObjectMemory>>areIntegers:and: (in category 'interpreter access') ----- + areIntegers: oop1 and: oop2 + "Test oop1 and oop2 to make sure both are SmallIntegers." + ^((oop1 bitAnd: oop2) bitAnd: 1) ~= 0! Item was added: + ----- Method: ObjectMemory>>maxSmallInteger (in category 'interpreter access') ----- + maxSmallInteger + ^1073741823! Item was added: + ----- Method: ObjectMemory>>minSmallInteger (in category 'interpreter access') ----- + minSmallInteger + ^-1073741824! Item was added: + ----- Method: ObjectMemory>>numSmallIntegerBits (in category 'interpreter access') ----- + numSmallIntegerBits + ^31! Item was added: + ----- Method: Spur32BitMemoryManager>>areIntegers:and: (in category 'interpreter access') ----- + areIntegers: oop1 and: oop2 + "Test oop1 and oop2 to make sure both are SmallIntegers." + ^((oop1 bitAnd: oop2) bitAnd: 1) ~= 0! Item was added: + ----- Method: Spur32BitMemoryManager>>maxSmallInteger (in category 'interpreter access') ----- + maxSmallInteger + ^16r3FFFFFFF! Item was added: + ----- Method: Spur32BitMemoryManager>>minSmallInteger (in category 'interpreter access') ----- + minSmallInteger + ^-16r40000000! Item was added: + ----- Method: Spur32BitMemoryManager>>numSmallIntegerBits (in category 'interpreter access') ----- + numSmallIntegerBits + ^31! Item was changed: ----- Method: Spur64BitMMLESimulator>>fetchFloatAt:into: (in category 'float primitives') ----- fetchFloatAt: floatBitsAddress into: aFloat + aFloat at: 2 put: (self long32At: floatBitsAddress). + aFloat at: 1 put: (self long32At: floatBitsAddress+4)! - aFloat at: 1 put: (self long64At: floatBitsAddress)! Item was added: + ----- Method: Spur64BitMemoryManager>>areIntegers:and: (in category 'interpreter access') ----- + areIntegers: oop1 and: oop2 + "Test oop1 and oop2 to make sure both are SmallIntegers." + ^(self isIntegerObject: oop1) + and: [self isIntegerObject: oop2]! Item was added: + ----- Method: Spur64BitMemoryManager>>maxSmallInteger (in category 'interpreter access') ----- + maxSmallInteger + ^16rFFFFFFFFFFFFFFF! Item was added: + ----- Method: Spur64BitMemoryManager>>minSmallInteger (in category 'interpreter access') ----- + minSmallInteger + ^-16r1000000000000000! Item was added: + ----- Method: Spur64BitMemoryManager>>numSmallIntegerBits (in category 'interpreter access') ----- + numSmallIntegerBits + ^61! Item was added: + ----- Method: SpurMemoryManager>>areIntegers:and: (in category 'interpreter access') ----- + areIntegers: oop1 and: oop2 + "Test oop1 and oop2 to make sure both are SmallIntegers." + self subclassResponsibility! Item was added: + ----- Method: SpurMemoryManager>>minSmallInteger (in category 'interpreter access') ----- + minSmallInteger + self subclassResponsibility! Item was added: + ----- Method: SpurMemoryManager>>numSmallIntegerBits (in category 'interpreter access') ----- + numSmallIntegerBits + self subclassResponsibility! Item was removed: - ----- Method: StackInterpreter>>areIntegers:and: (in category 'utilities') ----- - areIntegers: oop1 and: oop2 - "Test oop1 and oop2 to make sure both are SmallIntegers." - ^ ((oop1 bitAnd: oop2) bitAnd: 1) ~= 0! Item was changed: ----- Method: StackInterpreter>>bytecodePrimAdd (in category 'common selector sends') ----- bytecodePrimAdd | rcvr arg result | rcvr := self internalStackValue: 1. arg := self internalStackValue: 0. + (objectMemory areIntegers: rcvr and: arg) - (self areIntegers: rcvr and: arg) ifTrue: [result := (objectMemory integerValueOf: rcvr) + (objectMemory integerValueOf: arg). (objectMemory isIntegerValue: result) ifTrue: [self internalPop: 2 thenPush: (objectMemory integerObjectOf: result). ^ self fetchNextBytecode "success"]] ifFalse: [self initPrimCall. self externalizeIPandSP. self primitiveFloatAdd: rcvr toArg: arg. self internalizeIPandSP. self successful ifTrue: [^ self fetchNextBytecode "success"]]. messageSelector := self specialSelector: 0. argumentCount := 1. self normalSend! Item was changed: ----- Method: StackInterpreter>>bytecodePrimDivide (in category 'common selector sends') ----- bytecodePrimDivide | rcvr arg result | rcvr := self internalStackValue: 1. arg := self internalStackValue: 0. + (objectMemory areIntegers: rcvr and: arg) - (self areIntegers: rcvr and: arg) ifTrue: [rcvr := objectMemory integerValueOf: rcvr. arg := objectMemory integerValueOf: arg. (arg ~= 0 and: [rcvr \\ arg = 0]) ifTrue: [result := rcvr // arg. "generates C / operation" (objectMemory isIntegerValue: result) ifTrue: [self internalPop: 2 thenPush: (objectMemory integerObjectOf: result). ^ self fetchNextBytecode"success"]]] ifFalse: [self initPrimCall. self externalizeIPandSP. self primitiveFloatDivide: rcvr byArg: arg. self internalizeIPandSP. self successful ifTrue: [^ self fetchNextBytecode"success"]]. messageSelector := self specialSelector: 9. argumentCount := 1. self normalSend! Item was changed: ----- Method: StackInterpreter>>bytecodePrimEqual (in category 'common selector sends') ----- bytecodePrimEqual | rcvr arg aBool | rcvr := self internalStackValue: 1. arg := self internalStackValue: 0. + (objectMemory areIntegers: rcvr and: arg) ifTrue: [^self booleanCheat: rcvr = arg]. - (self areIntegers: rcvr and: arg) ifTrue: [^self booleanCheat: rcvr = arg]. self initPrimCall. aBool := self primitiveFloatEqual: rcvr toArg: arg. self successful ifTrue: [^self booleanCheat: aBool]. messageSelector := self specialSelector: 6. argumentCount := 1. self normalSend! Item was changed: ----- Method: StackInterpreter>>bytecodePrimEqualSistaV1 (in category 'common selector sends') ----- bytecodePrimEqualSistaV1 | rcvr arg aBool | rcvr := self internalStackValue: 1. arg := self internalStackValue: 0. + (objectMemory areIntegers: rcvr and: arg) ifTrue: [^self booleanCheatSistaV1: rcvr = arg]. - (self areIntegers: rcvr and: arg) ifTrue: [^self booleanCheatSistaV1: rcvr = arg]. self initPrimCall. aBool := self primitiveFloatEqual: rcvr toArg: arg. self successful ifTrue: [^self booleanCheatSistaV1: aBool]. messageSelector := self specialSelector: 6. argumentCount := 1. self normalSend! Item was changed: ----- Method: StackInterpreter>>bytecodePrimEqualV4 (in category 'common selector sends') ----- bytecodePrimEqualV4 | rcvr arg aBool | rcvr := self internalStackValue: 1. arg := self internalStackValue: 0. + (objectMemory areIntegers: rcvr and: arg) ifTrue: [^self booleanCheatV4: rcvr = arg]. - (self areIntegers: rcvr and: arg) ifTrue: [^self booleanCheatV4: rcvr = arg]. self initPrimCall. aBool := self primitiveFloatEqual: rcvr toArg: arg. self successful ifTrue: [^self booleanCheatV4: aBool]. messageSelector := self specialSelector: 6. argumentCount := 1. self normalSend! Item was changed: ----- Method: StackInterpreter>>bytecodePrimGreaterOrEqual (in category 'common selector sends') ----- bytecodePrimGreaterOrEqual | rcvr arg aBool | rcvr := self internalStackValue: 1. arg := self internalStackValue: 0. + (objectMemory areIntegers: rcvr and: arg) ifTrue: - (self areIntegers: rcvr and: arg) ifTrue: ["The C code can avoid detagging since tagged integers are still signed. But this means the simulator must override to do detagging." ^self cCode: [self booleanCheat: rcvr >= arg] inSmalltalk: [self booleanCheat: (objectMemory integerValueOf: rcvr) >= (objectMemory integerValueOf: arg)]]. self initPrimCall. aBool := self primitiveFloatGreaterOrEqual: rcvr toArg: arg. self successful ifTrue: [^self booleanCheat: aBool]. messageSelector := self specialSelector: 5. argumentCount := 1. self normalSend! Item was changed: ----- Method: StackInterpreter>>bytecodePrimGreaterOrEqualSistaV1 (in category 'common selector sends') ----- bytecodePrimGreaterOrEqualSistaV1 | rcvr arg aBool | rcvr := self internalStackValue: 1. arg := self internalStackValue: 0. + (objectMemory areIntegers: rcvr and: arg) ifTrue: - (self areIntegers: rcvr and: arg) ifTrue: ["The C code can avoid detagging since tagged integers are still signed. But this means the simulator must override to do detagging." ^self cCode: [self booleanCheatSistaV1: rcvr >= arg] inSmalltalk: [self booleanCheatSistaV1: (objectMemory integerValueOf: rcvr) >= (objectMemory integerValueOf: arg)]]. self initPrimCall. aBool := self primitiveFloatGreaterOrEqual: rcvr toArg: arg. self successful ifTrue: [^self booleanCheatSistaV1: aBool]. messageSelector := self specialSelector: 5. argumentCount := 1. self normalSend! Item was changed: ----- Method: StackInterpreter>>bytecodePrimGreaterOrEqualV4 (in category 'common selector sends') ----- bytecodePrimGreaterOrEqualV4 | rcvr arg aBool | rcvr := self internalStackValue: 1. arg := self internalStackValue: 0. + (objectMemory areIntegers: rcvr and: arg) ifTrue: - (self areIntegers: rcvr and: arg) ifTrue: ["The C code can avoid detagging since tagged integers are still signed. But this means the simulator must override to do detagging." ^self cCode: [self booleanCheatV4: rcvr >= arg] inSmalltalk: [self booleanCheatV4: (objectMemory integerValueOf: rcvr) >= (objectMemory integerValueOf: arg)]]. self initPrimCall. aBool := self primitiveFloatGreaterOrEqual: rcvr toArg: arg. self successful ifTrue: [^self booleanCheatV4: aBool]. messageSelector := self specialSelector: 5. argumentCount := 1. self normalSend! Item was changed: ----- Method: StackInterpreter>>bytecodePrimGreaterThan (in category 'common selector sends') ----- bytecodePrimGreaterThan | rcvr arg aBool | rcvr := self internalStackValue: 1. arg := self internalStackValue: 0. + (objectMemory areIntegers: rcvr and: arg) ifTrue: - (self areIntegers: rcvr and: arg) ifTrue: ["The C code can avoid detagging since tagged integers are still signed. But this means the simulator must override to do detagging." ^self cCode: [self booleanCheat: rcvr > arg] inSmalltalk: [self booleanCheat: (objectMemory integerValueOf: rcvr) > (objectMemory integerValueOf: arg)]]. self initPrimCall. aBool := self primitiveFloatGreater: rcvr thanArg: arg. self successful ifTrue: [^self booleanCheat: aBool]. messageSelector := self specialSelector: 3. argumentCount := 1. self normalSend! Item was changed: ----- Method: StackInterpreter>>bytecodePrimGreaterThanSistaV1 (in category 'common selector sends') ----- bytecodePrimGreaterThanSistaV1 | rcvr arg aBool | rcvr := self internalStackValue: 1. arg := self internalStackValue: 0. + (objectMemory areIntegers: rcvr and: arg) ifTrue: - (self areIntegers: rcvr and: arg) ifTrue: ["The C code can avoid detagging since tagged integers are still signed. But this means the simulator must override to do detagging." ^self cCode: [self booleanCheatSistaV1: rcvr > arg] inSmalltalk: [self booleanCheatSistaV1: (objectMemory integerValueOf: rcvr) > (objectMemory integerValueOf: arg)]]. self initPrimCall. aBool := self primitiveFloatGreater: rcvr thanArg: arg. self successful ifTrue: [^self booleanCheatSistaV1: aBool]. messageSelector := self specialSelector: 3. argumentCount := 1. self normalSend! Item was changed: ----- Method: StackInterpreter>>bytecodePrimGreaterThanV4 (in category 'common selector sends') ----- bytecodePrimGreaterThanV4 | rcvr arg aBool | rcvr := self internalStackValue: 1. arg := self internalStackValue: 0. + (objectMemory areIntegers: rcvr and: arg) ifTrue: - (self areIntegers: rcvr and: arg) ifTrue: ["The C code can avoid detagging since tagged integers are still signed. But this means the simulator must override to do detagging." ^self cCode: [self booleanCheatV4: rcvr > arg] inSmalltalk: [self booleanCheatV4: (objectMemory integerValueOf: rcvr) > (objectMemory integerValueOf: arg)]]. self initPrimCall. aBool := self primitiveFloatGreater: rcvr thanArg: arg. self successful ifTrue: [^self booleanCheatV4: aBool]. messageSelector := self specialSelector: 3. argumentCount := 1. self normalSend! Item was changed: ----- Method: StackInterpreter>>bytecodePrimLessOrEqual (in category 'common selector sends') ----- bytecodePrimLessOrEqual | rcvr arg aBool | rcvr := self internalStackValue: 1. arg := self internalStackValue: 0. + (objectMemory areIntegers: rcvr and: arg) ifTrue: - (self areIntegers: rcvr and: arg) ifTrue: ["The C code can avoid detagging since tagged integers are still signed. But this means the simulator must override to do detagging." ^self cCode: [self booleanCheat: rcvr <= arg] inSmalltalk: [self booleanCheat: (objectMemory integerValueOf: rcvr) <= (objectMemory integerValueOf: arg)]]. self initPrimCall. aBool := self primitiveFloatLessOrEqual: rcvr toArg: arg. self successful ifTrue: [^self booleanCheat: aBool]. messageSelector := self specialSelector: 4. argumentCount := 1. self normalSend! Item was changed: ----- Method: StackInterpreter>>bytecodePrimLessOrEqualSistaV1 (in category 'common selector sends') ----- bytecodePrimLessOrEqualSistaV1 | rcvr arg aBool | rcvr := self internalStackValue: 1. arg := self internalStackValue: 0. + (objectMemory areIntegers: rcvr and: arg) ifTrue: - (self areIntegers: rcvr and: arg) ifTrue: ["The C code can avoid detagging since tagged integers are still signed. But this means the simulator must override to do detagging." ^self cCode: [self booleanCheatSistaV1: rcvr <= arg] inSmalltalk: [self booleanCheatSistaV1: (objectMemory integerValueOf: rcvr) <= (objectMemory integerValueOf: arg)]]. self initPrimCall. aBool := self primitiveFloatLessOrEqual: rcvr toArg: arg. self successful ifTrue: [^self booleanCheatSistaV1: aBool]. messageSelector := self specialSelector: 4. argumentCount := 1. self normalSend! Item was changed: ----- Method: StackInterpreter>>bytecodePrimLessOrEqualV4 (in category 'common selector sends') ----- bytecodePrimLessOrEqualV4 | rcvr arg aBool | rcvr := self internalStackValue: 1. arg := self internalStackValue: 0. + (objectMemory areIntegers: rcvr and: arg) ifTrue: - (self areIntegers: rcvr and: arg) ifTrue: ["The C code can avoid detagging since tagged integers are still signed. But this means the simulator must override to do detagging." ^self cCode: [self booleanCheatV4: rcvr <= arg] inSmalltalk: [self booleanCheatV4: (objectMemory integerValueOf: rcvr) <= (objectMemory integerValueOf: arg)]]. self initPrimCall. aBool := self primitiveFloatLessOrEqual: rcvr toArg: arg. self successful ifTrue: [^self booleanCheatV4: aBool]. messageSelector := self specialSelector: 4. argumentCount := 1. self normalSend! Item was changed: ----- Method: StackInterpreter>>bytecodePrimLessThan (in category 'common selector sends') ----- bytecodePrimLessThan | rcvr arg aBool | rcvr := self internalStackValue: 1. arg := self internalStackValue: 0. + (objectMemory areIntegers: rcvr and: arg) ifTrue: - (self areIntegers: rcvr and: arg) ifTrue: ["The C code can avoid detagging since tagged integers are still signed. But this means the simulator must override to do detagging." ^self cCode: [self booleanCheat: rcvr < arg] inSmalltalk: [self booleanCheat: (objectMemory integerValueOf: rcvr) < (objectMemory integerValueOf: arg)]]. self initPrimCall. aBool := self primitiveFloatLess: rcvr thanArg: arg. self successful ifTrue: [^ self booleanCheat: aBool]. messageSelector := self specialSelector: 2. argumentCount := 1. self normalSend! Item was changed: ----- Method: StackInterpreter>>bytecodePrimLessThanSistaV1 (in category 'common selector sends') ----- bytecodePrimLessThanSistaV1 | rcvr arg aBool | rcvr := self internalStackValue: 1. arg := self internalStackValue: 0. + (objectMemory areIntegers: rcvr and: arg) ifTrue: - (self areIntegers: rcvr and: arg) ifTrue: ["The C code can avoid detagging since tagged integers are still signed. But this means the simulator must override to do detagging." ^self cCode: [self booleanCheatSistaV1: rcvr < arg] inSmalltalk: [self booleanCheatSistaV1: (objectMemory integerValueOf: rcvr) < (objectMemory integerValueOf: arg)]]. self initPrimCall. aBool := self primitiveFloatLess: rcvr thanArg: arg. self successful ifTrue: [^ self booleanCheatSistaV1: aBool]. messageSelector := self specialSelector: 2. argumentCount := 1. self normalSend! Item was changed: ----- Method: StackInterpreter>>bytecodePrimLessThanV4 (in category 'common selector sends') ----- bytecodePrimLessThanV4 | rcvr arg aBool | rcvr := self internalStackValue: 1. arg := self internalStackValue: 0. + (objectMemory areIntegers: rcvr and: arg) ifTrue: - (self areIntegers: rcvr and: arg) ifTrue: ["The C code can avoid detagging since tagged integers are still signed. But this means the simulator must override to do detagging." ^self cCode: [self booleanCheatV4: rcvr < arg] inSmalltalk: [self booleanCheatV4: (objectMemory integerValueOf: rcvr) < (objectMemory integerValueOf: arg)]]. self initPrimCall. aBool := self primitiveFloatLess: rcvr thanArg: arg. self successful ifTrue: [^ self booleanCheatV4: aBool]. messageSelector := self specialSelector: 2. argumentCount := 1. self normalSend! Item was changed: ----- Method: StackInterpreter>>bytecodePrimMultiply (in category 'common selector sends') ----- bytecodePrimMultiply | rcvr arg result | rcvr := self internalStackValue: 1. arg := self internalStackValue: 0. + (objectMemory areIntegers: rcvr and: arg) - (self areIntegers: rcvr and: arg) ifTrue: [rcvr := objectMemory integerValueOf: rcvr. arg := objectMemory integerValueOf: arg. result := rcvr * arg. (arg = 0 or: [(result // arg) = rcvr and: [objectMemory isIntegerValue: result]]) ifTrue: [self internalPop: 2 thenPush: (objectMemory integerObjectOf: result). ^self fetchNextBytecode "success"]] ifFalse: [self initPrimCall. self externalizeIPandSP. self primitiveFloatMultiply: rcvr byArg: arg. self internalizeIPandSP. self successful ifTrue: [^ self fetchNextBytecode "success"]]. messageSelector := self specialSelector: 8. argumentCount := 1. self normalSend! Item was changed: ----- Method: StackInterpreter>>bytecodePrimNotEqual (in category 'common selector sends') ----- bytecodePrimNotEqual | rcvr arg aBool | rcvr := self internalStackValue: 1. arg := self internalStackValue: 0. + (objectMemory areIntegers: rcvr and: arg) ifTrue: [^self booleanCheat: rcvr ~= arg]. - (self areIntegers: rcvr and: arg) ifTrue: [^self booleanCheat: rcvr ~= arg]. self initPrimCall. aBool := self primitiveFloatEqual: rcvr toArg: arg. self successful ifTrue: [^self booleanCheat: aBool not]. messageSelector := self specialSelector: 7. argumentCount := 1. self normalSend! Item was changed: ----- Method: StackInterpreter>>bytecodePrimNotEqualSistaV1 (in category 'common selector sends') ----- bytecodePrimNotEqualSistaV1 | rcvr arg aBool | rcvr := self internalStackValue: 1. arg := self internalStackValue: 0. + (objectMemory areIntegers: rcvr and: arg) ifTrue: [^self booleanCheatSistaV1: rcvr ~= arg]. - (self areIntegers: rcvr and: arg) ifTrue: [^self booleanCheatSistaV1: rcvr ~= arg]. self initPrimCall. aBool := self primitiveFloatEqual: rcvr toArg: arg. self successful ifTrue: [^self booleanCheatSistaV1: aBool not]. messageSelector := self specialSelector: 7. argumentCount := 1. self normalSend! Item was changed: ----- Method: StackInterpreter>>bytecodePrimNotEqualV4 (in category 'common selector sends') ----- bytecodePrimNotEqualV4 | rcvr arg aBool | rcvr := self internalStackValue: 1. arg := self internalStackValue: 0. + (objectMemory areIntegers: rcvr and: arg) ifTrue: [^self booleanCheatV4: rcvr ~= arg]. - (self areIntegers: rcvr and: arg) ifTrue: [^self booleanCheatV4: rcvr ~= arg]. self initPrimCall. aBool := self primitiveFloatEqual: rcvr toArg: arg. self successful ifTrue: [^self booleanCheatV4: aBool not]. messageSelector := self specialSelector: 7. argumentCount := 1. self normalSend! Item was changed: ----- Method: StackInterpreter>>bytecodePrimSubtract (in category 'common selector sends') ----- bytecodePrimSubtract | rcvr arg result | rcvr := self internalStackValue: 1. arg := self internalStackValue: 0. + (objectMemory areIntegers: rcvr and: arg) - (self areIntegers: rcvr and: arg) ifTrue: [result := (objectMemory integerValueOf: rcvr) - (objectMemory integerValueOf: arg). (objectMemory isIntegerValue: result) ifTrue: [self internalPop: 2 thenPush: (objectMemory integerObjectOf: result). ^self fetchNextBytecode "success"]] ifFalse: [self initPrimCall. self externalizeIPandSP. self primitiveFloatSubtract: rcvr fromArg: arg. self internalizeIPandSP. self successful ifTrue: [^self fetchNextBytecode "success"]]. messageSelector := self specialSelector: 1. argumentCount := 1. self normalSend! Item was changed: ----- Method: StackInterpreter>>doPrimitiveDiv:by: (in category 'arithmetic primitive support') ----- doPrimitiveDiv: rcvr by: arg "Rounds negative results towards negative infinity, rather than zero." | result posArg posRcvr integerRcvr integerArg | + (objectMemory areIntegers: rcvr and: arg) - (self areIntegers: rcvr and: arg) ifTrue: [integerRcvr := objectMemory integerValueOf: rcvr. integerArg := objectMemory integerValueOf: arg. self success: integerArg ~= 0] ifFalse: [self primitiveFail]. self successful ifFalse: [^ 1 "fail"]. integerRcvr > 0 ifTrue: [integerArg > 0 ifTrue: [result := integerRcvr // integerArg] ifFalse: ["round negative result toward negative infinity" posArg := 0 - integerArg. result := 0 - ((integerRcvr + (posArg - 1)) // posArg)]] ifFalse: [posRcvr := 0 - integerRcvr. integerArg > 0 ifTrue: ["round negative result toward negative infinity" result := 0 - ((posRcvr + (integerArg - 1)) // integerArg)] ifFalse: [posArg := 0 - integerArg. result := posRcvr // posArg]]. self success: (objectMemory isIntegerValue: result). ^ result! Item was changed: ----- Method: StackInterpreter>>doPrimitiveMod:by: (in category 'arithmetic primitive support') ----- doPrimitiveMod: rcvr by: arg | integerResult integerRcvr integerArg | + (objectMemory areIntegers: rcvr and: arg) - (self areIntegers: rcvr and: arg) ifTrue: [integerRcvr := objectMemory integerValueOf: rcvr. integerArg := objectMemory integerValueOf: arg. self success: integerArg ~= 0] ifFalse: [self primitiveFail]. self successful ifFalse: [^ 1 "fail"]. integerResult := integerRcvr \\ integerArg. "ensure that the result has the same sign as the integerArg" integerArg < 0 ifTrue: [integerResult > 0 ifTrue: [integerResult := integerResult + integerArg]] ifFalse: [integerResult < 0 ifTrue: [integerResult := integerResult + integerArg]]. self success: (objectMemory isIntegerValue: integerResult). ^ integerResult! Item was changed: ----- Method: VMBasicConstants class>>mostBasicConstantSelectors (in category 'C translation') ----- mostBasicConstantSelectors "c.f. mostBasicConstantNames" + ^#( baseHeaderSize wordSize bytesPerOop shiftForWord + bytesPerWord "bytesPerWord isn't used, but kept for history" + minSmallInteger maxSmallInteger)! - ^#(baseHeaderSize wordSize bytesPerOop shiftForWord bytesPerWord "bytesPerWord isn't used, but kept for history")! Item was changed: ----- Method: VMClass class>>writeVMHeaderTo:bytesPerWord: (in category 'translation') ----- writeVMHeaderTo: aStream bytesPerWord: bytesPerWord "Generate the contents of interp.h on aStream. Specific Interpreter subclasses override to add more stuff." aStream nextPutAll: '#define VM_PROXY_MAJOR '; print: self vmProxyMajorVersion; cr; nextPutAll: '#define VM_PROXY_MINOR '; print: self vmProxyMinorVersion; cr; cr; nextPutAll: '#define SQ_VI_BYTES_PER_WORD '; print: bytesPerWord; cr; cr. "The most basic constants must be defined here, not in e.g. the plugin sources, so allow those other sources to be shared between different builds (Spur vs SqueakV3, 32-bit vs 64-bit, etc)" VMBasicConstants mostBasicConstantNames asSet asArray sort do: [:constName| (VMBasicConstants classPool at: constName ifAbsent: []) ifNotNil: [:const| aStream nextPutAll: '#define '; nextPutAll: constName; space; print: const; cr]]. aStream cr. ((VMBasicConstants classPool associations select: [:a| a key beginsWith: 'PrimErr']) asSortedCollection: [:a1 :a2| a1 value <= a2 value]) do: [:a| aStream nextPutAll: '#define '; nextPutAll: a key; space; print: a value; cr]. + aStream cr. + + aStream + nextPutAll: '#define MinSmallInteger '; print: self objectMemoryClass minSmallInteger; cr; + nextPutAll: '#define MaxSmallInteger '; print: self objectMemoryClass maxSmallInteger; cr; + cr.! - aStream cr!

1 0

VM Maker: Cog-eem.220.mcz
by commits＠source.squeak.org 19 Nov '14

19 Nov '14

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.220.mcz ==================== Summary ==================== Name: Cog-eem.220 Author: eem Time: 19 November 2014, 12:53:37.657 pm UUID: c42711e1-47b7-49df-b723-80dcd137056b Ancestors: Cog-eem.219 Rename SpurBootstrap32to64 to Spur32to64BitBootstrap. Make sure the hiddenRootsObj is set before altering the system. Add alterSystem to (currently only) nil WordSize. Assume Kernel.spur-eem.884 etc that reimplements SmallInteger class>>minVal & maxVal to answer the values computed at start-up. =============== Diff against Cog-eem.219 =============== Item was added: + SimulatorHarness subclass: #Spur32to64BitBootstrap + instanceVariableNames: 'heap32 heap64 map reverseMap interpreter32 interpreter64 imageHeaderFlags savedWindowSize literalMap' + classVariableNames: '' + poolDictionaries: 'VMObjectIndices VMSqueakClassIndices' + category: 'Cog-Bootstrapping'! Item was added: + ----- Method: Spur32to64BitBootstrap>>alterSystem (in category 'bootstrap image') ----- + alterSystem + self nilWordSize! Item was added: + ----- Method: Spur32to64BitBootstrap>>bootstrapImage (in category 'public access') ----- + bootstrapImage + self cloneObjects. + self fillInObjects. + self fillInHeap. + self alterSystem! Item was added: + ----- Method: Spur32to64BitBootstrap>>bootstrapImage: (in category 'public access') ----- + bootstrapImage: imageName + (Smalltalk classNamed: #FileReference) ifNotNil: + [^self bootstrapImageUsingFileReference: imageName]. + (Smalltalk classNamed: #FileDirectory) ifNotNil: + [^self bootstrapImageUsingFileDirectory: imageName]. + self error: 'at a loss as to what file system support to use'! Item was added: + ----- Method: Spur32to64BitBootstrap>>bootstrapImageUsingFileDirectory: (in category 'public access') ----- + bootstrapImageUsingFileDirectory: imageName + | dirName baseName dir | + dirName := FileDirectory dirPathFor: imageName. + baseName := (imageName endsWith: '.image') + ifTrue: [FileDirectory baseNameFor: imageName] + ifFalse: [FileDirectory localNameFor: imageName]. + dir := dirName isEmpty ifTrue: [FileDirectory default] ifFalse: [FileDirectory default on: dirName]. + self on: (dir fullNameFor: baseName, '.image'). + [self bootstrapImage] + on: Halt + do: [:ex| + "suppress halts from the usual suspects (development time halts)" + (#(fullGC compactImage) includes: ex signalerContext sender selector) + ifTrue: [ex resume] + ifFalse: [ex pass]]. + self writeSnapshot: (dir fullNameFor: baseName, '-64.image') + headerFlags: imageHeaderFlags + screenSize: savedWindowSize. + dir deleteFileNamed: baseName, '-64.changes'; + copyFileNamed: baseName, '.changes' toFileNamed: baseName, '-64.changes'! Item was added: + ----- Method: Spur32to64BitBootstrap>>clone: (in category 'bootstrap image') ----- + clone: obj32 + | obj64 format numSlots numBytes hash | + format := heap32 formatOf: obj32. + numSlots := heap32 numSlotsOf: obj32. + format > heap32 lastPointerFormat ifTrue: + [format < heap32 firstByteFormat + ifTrue: + [format = heap32 firstLongFormat + ifTrue: + [numSlots := heap32 numSlotsOf: obj32. + numSlots odd ifTrue: + [format := format + 1]. + numSlots := numSlots + 1 // 2] + ifFalse: [self error: 'bad format']] + ifFalse: + [numBytes := heap32 numBytesOf: obj32. + format < heap32 firstCompiledMethodFormat + ifTrue: + [format := heap64 byteFormatForNumBytes: numBytes. + numSlots := numSlots + 1 // 2] + ifFalse: + [numSlots := heap32 numPointerSlotsOf: obj32. + numBytes := numBytes - (numSlots * heap32 bytesPerOop). + format := (heap64 byteFormatForNumBytes: numBytes) + heap32 firstCompiledMethodFormat - heap32 firstByteFormat. + numSlots := numSlots + (heap64 numSlotsForBytes: numBytes)]]]. + obj64 := heap64 + allocateSlots: numSlots + format: format + classIndex: (heap32 classIndexOf: obj32). + (hash := heap32 rawHashBitsOf: obj32) ~= 0 ifTrue: + [heap64 setHashBitsOf: obj64 to: hash]. + (heap32 isImmutable: obj32) ~= 0 ifTrue: + [heap64 setIsImmutableOf: obj64 to: true]. + (heap32 isPinned: obj32) ~= 0 ifTrue: + [heap64 setIsPinnedOf: obj64 to: true]. + self deny: (heap32 isRemembered: obj32). + self deny: (heap32 isMarked: obj32). + self deny: (heap32 isGrey: obj32). + reverseMap at: obj64 put: obj32. + ^map at: obj32 put: obj64! Item was added: + ----- Method: Spur32to64BitBootstrap>>cloneFreeLists: (in category 'bootstrap image') ----- + cloneFreeLists: obj32 + | obj64 | + obj64 := heap64 + allocateSlots: heap64 numFreeLists + format: heap64 sixtyFourBitIndexableFormat + classIndex: heap64 sixtyFourBitLongsClassIndexPun. + reverseMap at: obj64 put: obj32. + ^map at: obj32 put: obj64! Item was added: + ----- Method: Spur32to64BitBootstrap>>cloneObjects (in category 'bootstrap image') ----- + cloneObjects + "Clone all normal objects. Of hidden objects only clone the freeLists object and + the classTableRoot and class table pages. In particular, dont clone objStacks. + The refs to the objStacks are nilled out in fillInHeap." + | freeListsObject | + freeListsObject := heap32 freeListsObject. + heap32 allOldSpaceObjectsDo: + [:obj32| | classIndex value | + classIndex := heap32 classIndexOf: obj32. + obj32 = freeListsObject + ifTrue: + [self cloneFreeLists: obj32] + ifFalse: + [(heap32 isValidObjStackPage: obj32) ifFalse: + [((classIndex between: ClassLargeNegativeIntegerCompactIndex and: ClassLargePositiveIntegerCompactIndex) + and: [interpreter32 initPrimCall. + value := interpreter32 signed64BitValueOf: obj32. + interpreter32 failed not + and: [heap64 isIntegerValue: value]]) ifFalse: + [self clone: obj32]]]]! Item was added: + ----- Method: Spur32to64BitBootstrap>>fillInBitsObject:from: (in category 'bootstrap image') ----- + fillInBitsObject: obj64 from: obj32 + 0 to: (heap32 numBytesOf: obj32) - 1 do: + [:i| + heap64 + storeByte: i + ofObject: obj64 + withValue: (heap32 fetchByte: i ofObject: obj32)]! Item was added: + ----- Method: Spur32to64BitBootstrap>>fillInCompiledMethod:from: (in category 'bootstrap image') ----- + fillInCompiledMethod: obj64 from: obj32 + | offset | + "interpreter32 printOop: oop32" + "interpreter64 printOop: oop64" + 0 to: (heap32 numPointerSlotsOf: obj32) - 1 do: + [:i| | oop32 oop64 | + oop32 := heap32 fetchPointer: i ofObject: obj32. + oop64 := self map32BitOop: oop32. + heap64 + storePointerUnchecked: i + ofObject: obj64 + withValue: oop64. + (heap64 isIntegerObject: oop64) ifTrue: + [interpreter32 initPrimCall. + self assert: (interpreter32 signed64BitValueOf: oop32) = (heap64 integerValueOf: oop64)]]. + offset := (interpreter64 startPCOfMethod: obj64) + - (interpreter32 startPCOfMethod: obj32). + (interpreter32 startPCOfMethod: obj32) + to: (heap32 numBytesOf: obj32) - 1 + do: [:j| + heap64 + storeByte: offset + j + ofObject: obj64 + withValue: (heap32 fetchByte: j ofObject: obj32)]! Item was added: + ----- Method: Spur32to64BitBootstrap>>fillInHeap (in category 'bootstrap image') ----- + fillInHeap + | heapEnd freeListsObj | + heapEnd := heap64 freeStart. + heap64 + nilObject: (map at: heap32 nilObject); + falseObject: (map at: heap32 falseObject); + trueObject: (map at: heap32 trueObject); + specialObjectsOop: (map at: heap32 specialObjectsOop); + lastHash: heap32 lastHash; + setHiddenRootsObj: (map at: heap32 classTableRootObj). + heap64 segmentManager + initSegmentForInImageCompilationFrom: heap64 nilObject + to: heapEnd + heap64 bridgeSize. + freeListsObj := heap64 objectAfter: heap64 trueObject. + "Nil-out the free lists." + heap64 + fillObj: freeListsObj numSlots: (heap64 numSlotsOf: freeListsObj) with: 0; + initializeFreeSpacePostLoad: freeListsObj; + initializePostBootstrap; + setEndOfMemory: (heap64 segmentManager bridgeAt: 0) + heap64 baseHeaderSize! Item was added: + ----- Method: Spur32to64BitBootstrap>>fillInObjects (in category 'bootstrap image') ----- + fillInObjects + "interpreter32 printOop: obj32" + {heap32 markStack. heap32 weaklingStack. heap32 ephemeronQueue} do: + [:obj| + obj ~= heap32 nilObject ifTrue: + [map at: obj put: (map at: heap32 nilObject)]]. + heap32 allObjectsDo: + [:obj32| + (map at: obj32 ifAbsent: nil) + ifNotNil: + [:obj64| | format classIndex | + (heap64 numSlotsOf: obj64) > 0 ifTrue: "filter-out filtered objStack pages" + [format := heap32 formatOf: obj32. + (heap64 isPointersFormat: format) + ifTrue: + [((heap64 isIndexableFormat: format) + and: [(classIndex := heap64 classIndexOf: obj64) <= ClassBlockClosureCompactIndex + and: [classIndex >= ClassMethodContextCompactIndex]]) + ifTrue: [self fillInPointerObjectWithPC: obj64 from: obj32] + ifFalse: [self fillInPointerObject: obj64 from: obj32]] + ifFalse: + [(heap64 isCompiledMethodFormat: format) + ifTrue: [self fillInCompiledMethod: obj64 from: obj32] + ifFalse: [self fillInBitsObject: obj64 from: obj32]]]] + ifNil: [self assert: (self isUnmappedObject: obj32)]]! Item was added: + ----- Method: Spur32to64BitBootstrap>>fillInPointerObject:from: (in category 'bootstrap image') ----- + fillInPointerObject: obj64 from: obj32 + 0 to: (heap64 numSlotsOf: obj64) - 1 do: + [:i| + heap64 + storePointerUnchecked: i + ofObject: obj64 + withValue: (self map32BitOop: (heap32 fetchPointer: i ofObject: obj32))]! Item was added: + ----- Method: Spur32to64BitBootstrap>>fillInPointerObjectWithPC:from: (in category 'bootstrap image') ----- + fillInPointerObjectWithPC: obj64 from: obj32 + | method | + self fillInPointerObject: obj64 from: obj32. + (heap64 classIndexOf: obj64) = ClassBlockClosureCompactIndex ifTrue: + [method := heap32 + fetchPointer: MethodIndex + ofObject: (heap32 + fetchPointer: ClosureOuterContextIndex + ofObject: obj32). + self incrementPCField: ClosureStartPCIndex ofObject: obj64 for: method]. + (heap64 classIndexOf: obj64) = ClassMethodContextCompactIndex ifTrue: + [method := heap32 + fetchPointer: MethodIndex + ofObject: obj32. + self incrementPCField: InstructionPointerIndex ofObject: obj64 for: method]! Item was added: + ----- Method: Spur32to64BitBootstrap>>findSymbol: (in category 'public access') ----- + findSymbol: aString + "Find the Symbol equal to aString in oldHeap." + | symbolClass | + (literalMap at: aString ifAbsent: nil) ifNotNil: + [:oop| ^oop]. + symbolClass := self symbolClass. + heap64 allObjectsDo: + [:obj| + (symbolClass = (heap64 fetchClassOfNonImm: obj) + and: [(heap64 numBytesOf: obj) = aString size + and: [aString = (heap64 stringOf: obj)]]) ifTrue: + [aString isSymbol ifTrue: + [literalMap at: aString asSymbol put: obj]. + ^obj]]. + Transcript cr; nextPutAll: 'Warning, could not find '; store: aString; flush. + ^nil! Item was added: + ----- Method: Spur32to64BitBootstrap>>incrementPCField:ofObject:for: (in category 'bootstrap image') ----- + incrementPCField: fieldIndex ofObject: obj64 for: method32 + | value nLits | + value := heap64 fetchPointer: fieldIndex ofObject: obj64. + (heap64 isIntegerObject: value) + ifTrue: + [nLits := heap32 literalCountOf: method32. + heap64 + storePointerUnchecked: fieldIndex + ofObject: obj64 + withValue: (heap64 integerObjectOf: nLits + LiteralStart * 4 + (heap64 integerValueOf: value))] + ifFalse: + [self assert: (reverseMap at: value) = heap32 nilObject]! Item was added: + ----- Method: Spur32to64BitBootstrap>>initMaps (in category 'initialize-release') ----- + initMaps + map := Dictionary new: heap32 memory size // 32. + reverseMap := Dictionary new: heap32 memory size // 32. + literalMap := IdentityDictionary new! Item was added: + ----- Method: Spur32to64BitBootstrap>>isUnmappedObject: (in category 'bootstrap image') ----- + isUnmappedObject: obj32 + "Answer if obj32 is an object that is not cloned by the bootstrap." + ^((heap32 classIndexOf: obj32) + between: ClassLargeNegativeIntegerCompactIndex + and: ClassLargePositiveIntegerCompactIndex) + or: [obj32 = heap32 freeListsObject + or: [heap32 isValidObjStackPage: obj32]]! Item was added: + ----- Method: Spur32to64BitBootstrap>>map32BitOop: (in category 'bootstrap image') ----- + map32BitOop: oop32 + "interpreter32 printOop: oop32" + ^map + at: oop32 + ifAbsent: + [(heap32 isImmediate: oop32) + ifTrue: + [(heap32 isImmediateCharacter: oop32) + ifTrue: [heap64 characterObjectOf: (heap32 characterValueOf: oop32)] + ifFalse: [heap64 integerObjectOf: (heap32 integerValueOf: oop32)]] + ifFalse: + [| value | + self assert: (self isUnmappedObject: oop32). + interpreter32 initPrimCall. + value := interpreter32 signed64BitValueOf: oop32. + self deny: interpreter32 failed. + heap64 integerObjectOf: value]]! Item was added: + ----- Method: Spur32to64BitBootstrap>>nilWordSize (in category 'bootstrap image') ----- + nilWordSize + | wordSizeSym | + wordSizeSym := self findSymbol: #WordSize. + heap64 allOldSpaceObjectsDo: + [:o| + ((heap64 numSlotsOf: o) > ValueIndex + and: [(heap64 isPointersNonImm: o) + and: [(heap64 fetchPointer: KeyIndex ofObject: o) = wordSizeSym + and: [(heap64 fetchPointer: ValueIndex ofObject: o) = (heap64 integerObjectOf: 4)]]]) ifTrue: + [heap64 storePointer: ValueIndex ofObject: o withValue: heap64 nilObject]]! Item was added: + ----- Method: Spur32to64BitBootstrap>>on: (in category 'public access') ----- + on: imageName + (interpreter32 := StackInterpreterSimulator newWithOptions: #(ObjectMemory Spur32BitMemoryManager)) + openOn: imageName extraMemory: 0. + heap32 := interpreter32 objectMemory. + imageHeaderFlags := interpreter32 getImageHeaderFlags. + savedWindowSize := interpreter32 savedWindowSize. + interpreter64 := StackInterpreterSimulator newWithOptions: #(ObjectMemory Spur64BitMemoryManager). + heap64 := interpreter64 objectMemory. + heap64 + allocateMemoryOfSize: heap32 oldSpaceSize * 2 + newSpaceSize: 8 * 1024 * 1024 + stackSize: 16 * 1024 + codeSize: 0. + heap64 bootstrapping: true. + self initMaps! Item was added: + ----- Method: Spur32to64BitBootstrap>>symbolClass (in category 'public access') ----- + symbolClass + ^heap64 fetchClassOfNonImm: (heap64 splObj: SelectorDoesNotUnderstand)! Item was added: + ----- Method: Spur32to64BitBootstrap>>writeSnapshot:headerFlags:screenSize: (in category 'snapshot') ----- + writeSnapshot: imageFileName headerFlags: headerFlags screenSize: screenSizeInteger + heap64 + checkFreeSpace; + runLeakCheckerForFullGC: true. + interpreter64 + setImageHeaderFlagsFrom: headerFlags; + setDisplayForm: nil; + imageName: imageFileName; + writeImageFileIO. + Transcript cr; show: 'Done!!'! Item was removed: - SimulatorHarness subclass: #SpurBootstrap32to64 - instanceVariableNames: 'heap32 heap64 map reverseMap interpreter32 interpreter64 imageHeaderFlags savedWindowSize' - classVariableNames: '' - poolDictionaries: 'VMSqueakClassIndices' - category: 'Cog-Bootstrapping'! Item was removed: - ----- Method: SpurBootstrap32to64>>bootstrapImage (in category 'public access') ----- - bootstrapImage - self cloneObjects. - self fillInObjects. - self fillInHeap! Item was removed: - ----- Method: SpurBootstrap32to64>>bootstrapImage: (in category 'public access') ----- - bootstrapImage: imageName - (Smalltalk classNamed: #FileReference) ifNotNil: - [^self bootstrapImageUsingFileReference: imageName]. - (Smalltalk classNamed: #FileDirectory) ifNotNil: - [^self bootstrapImageUsingFileDirectory: imageName]. - self error: 'at a loss as to what file system support to use'! Item was removed: - ----- Method: SpurBootstrap32to64>>bootstrapImageUsingFileDirectory: (in category 'public access') ----- - bootstrapImageUsingFileDirectory: imageName - | dirName baseName dir | - dirName := FileDirectory dirPathFor: imageName. - baseName := (imageName endsWith: '.image') - ifTrue: [FileDirectory baseNameFor: imageName] - ifFalse: [FileDirectory localNameFor: imageName]. - dir := dirName isEmpty ifTrue: [FileDirectory default] ifFalse: [FileDirectory default on: dirName]. - self on: (dir fullNameFor: baseName, '.image'). - [self bootstrapImage] - on: Halt - do: [:ex| - "suppress halts from the usual suspects (development time halts)" - (#(fullGC compactImage) includes: ex signalerContext sender selector) - ifTrue: [ex resume] - ifFalse: [ex pass]]. - self writeSnapshot: (dir fullNameFor: baseName, '-64.image') - headerFlags: imageHeaderFlags - screenSize: savedWindowSize. - dir deleteFileNamed: baseName, '-64.changes'; - copyFileNamed: baseName, '.changes' toFileNamed: baseName, '-64.changes'! Item was removed: - ----- Method: SpurBootstrap32to64>>clone: (in category 'bootstrap image') ----- - clone: obj32 - | obj64 format numSlots numBytes hash | - format := heap32 formatOf: obj32. - numSlots := heap32 numSlotsOf: obj32. - format > heap32 lastPointerFormat ifTrue: - [format < heap32 firstByteFormat - ifTrue: - [format = heap32 firstLongFormat - ifTrue: - [numSlots := heap32 numSlotsOf: obj32. - numSlots odd ifTrue: - [format := format + 1]. - numSlots := numSlots + 1 // 2] - ifFalse: [self error: 'bad format']] - ifFalse: - [numBytes := heap32 numBytesOf: obj32. - format < heap32 firstCompiledMethodFormat - ifTrue: - [format := heap64 byteFormatForNumBytes: numBytes. - numSlots := numSlots + 1 // 2] - ifFalse: - [numSlots := heap32 numPointerSlotsOf: obj32. - numBytes := numBytes - (numSlots * heap32 bytesPerOop). - format := (heap64 byteFormatForNumBytes: numBytes) + heap32 firstCompiledMethodFormat - heap32 firstByteFormat. - numSlots := numSlots + (heap64 numSlotsForBytes: numBytes)]]]. - obj64 := heap64 - allocateSlots: numSlots - format: format - classIndex: (heap32 classIndexOf: obj32). - (hash := heap32 rawHashBitsOf: obj32) ~= 0 ifTrue: - [heap64 setHashBitsOf: obj64 to: hash]. - (heap32 isImmutable: obj32) ~= 0 ifTrue: - [heap64 setIsImmutableOf: obj64 to: true]. - (heap32 isPinned: obj32) ~= 0 ifTrue: - [heap64 setIsPinnedOf: obj64 to: true]. - self deny: (heap32 isRemembered: obj32). - self deny: (heap32 isMarked: obj32). - self deny: (heap32 isGrey: obj32). - reverseMap at: obj64 put: obj32. - ^map at: obj32 put: obj64! Item was removed: - ----- Method: SpurBootstrap32to64>>cloneFreeLists: (in category 'bootstrap image') ----- - cloneFreeLists: obj32 - | obj64 | - obj64 := heap64 - allocateSlots: heap64 numFreeLists - format: heap64 sixtyFourBitIndexableFormat - classIndex: heap64 sixtyFourBitLongsClassIndexPun. - reverseMap at: obj64 put: obj32. - ^map at: obj32 put: obj64! Item was removed: - ----- Method: SpurBootstrap32to64>>cloneObjects (in category 'bootstrap image') ----- - cloneObjects - "Clone all normal objects. Of hidden objects only clone the freeLists object and - the classTableRoot and class table pages. In particular, dont clone objStacks. - The refs to the objStacks are nilled out in fillInHeap." - | freeListsObject | - freeListsObject := heap32 freeListsObject. - heap32 allOldSpaceObjectsDo: - [:obj32| | classIndex value | - classIndex := heap32 classIndexOf: obj32. - obj32 = freeListsObject - ifTrue: - [self cloneFreeLists: obj32] - ifFalse: - [(heap32 isValidObjStackPage: obj32) ifFalse: - [((classIndex between: ClassLargeNegativeIntegerCompactIndex and: ClassLargePositiveIntegerCompactIndex) - and: [interpreter32 initPrimCall. - value := interpreter32 signed64BitValueOf: obj32. - interpreter32 failed not - and: [heap64 isIntegerValue: value]]) ifFalse: - [self clone: obj32]]]]! Item was removed: - ----- Method: SpurBootstrap32to64>>fillInBitsObject:from: (in category 'bootstrap image') ----- - fillInBitsObject: obj64 from: obj32 - 0 to: (heap32 numBytesOf: obj32) - 1 do: - [:i| - heap64 - storeByte: i - ofObject: obj64 - withValue: (heap32 fetchByte: i ofObject: obj32)]! Item was removed: - ----- Method: SpurBootstrap32to64>>fillInCompiledMethod:from: (in category 'bootstrap image') ----- - fillInCompiledMethod: obj64 from: obj32 - | offset | - "interpreter32 printOop: oop32" - "interpreter64 printOop: oop64" - 0 to: (heap32 numPointerSlotsOf: obj32) - 1 do: - [:i| | oop32 oop64 | - oop32 := heap32 fetchPointer: i ofObject: obj32. - oop64 := self map32BitOop: oop32. - heap64 - storePointerUnchecked: i - ofObject: obj64 - withValue: oop64. - (heap64 isIntegerObject: oop64) ifTrue: - [interpreter32 initPrimCall. - self assert: (interpreter32 signed64BitValueOf: oop32) = (heap64 integerValueOf: oop64)]]. - offset := (interpreter64 startPCOfMethod: obj64) - - (interpreter32 startPCOfMethod: obj32). - (interpreter32 startPCOfMethod: obj32) - to: (heap32 numBytesOf: obj32) - 1 - do: [:j| - heap64 - storeByte: offset + j - ofObject: obj64 - withValue: (heap32 fetchByte: j ofObject: obj32)]! Item was removed: - ----- Method: SpurBootstrap32to64>>fillInHeap (in category 'bootstrap image') ----- - fillInHeap - | heapEnd freeListsObj | - heapEnd := heap64 freeStart. - heap64 - nilObject: (map at: heap32 nilObject); - falseObject: (map at: heap32 falseObject); - trueObject: (map at: heap32 trueObject); - specialObjectsOop: (map at: heap32 specialObjectsOop); - lastHash: heap32 lastHash. - heap64 segmentManager - initSegmentForInImageCompilationFrom: heap64 nilObject - to: heapEnd + heap64 bridgeSize. - freeListsObj := heap64 objectAfter: heap64 trueObject. - "Nil-out the free lists." - heap64 - fillObj: freeListsObj numSlots: (heap64 numSlotsOf: freeListsObj) with: 0; - initializeFreeSpacePostLoad: freeListsObj; - initializePostBootstrap; - setEndOfMemory: (heap64 segmentManager bridgeAt: 0) + heap64 baseHeaderSize! Item was removed: - ----- Method: SpurBootstrap32to64>>fillInObjects (in category 'bootstrap image') ----- - fillInObjects - "interpreter32 printOop: obj32" - {heap32 markStack. heap32 weaklingStack. heap32 ephemeronQueue} do: - [:obj| - obj ~= heap32 nilObject ifTrue: - [map at: obj put: (map at: heap32 nilObject)]]. - heap32 allObjectsDo: - [:obj32| - (map at: obj32 ifAbsent: nil) - ifNotNil: - [:obj64| | format classIndex | - (heap64 numSlotsOf: obj64) > 0 ifTrue: "filter-out filtered objStack pages" - [format := heap32 formatOf: obj32. - (heap64 isPointersFormat: format) - ifTrue: - [((heap64 isIndexableFormat: format) - and: [(classIndex := heap64 classIndexOf: obj64) <= ClassBlockClosureCompactIndex - and: [classIndex >= ClassMethodContextCompactIndex]]) - ifTrue: [self fillInPointerObjectWithPC: obj64 from: obj32] - ifFalse: [self fillInPointerObject: obj64 from: obj32]] - ifFalse: - [(heap64 isCompiledMethodFormat: format) - ifTrue: [self fillInCompiledMethod: obj64 from: obj32] - ifFalse: [self fillInBitsObject: obj64 from: obj32]]]] - ifNil: [self assert: (self isUnmappedObject: obj32)]]! Item was removed: - ----- Method: SpurBootstrap32to64>>fillInPointerObject:from: (in category 'bootstrap image') ----- - fillInPointerObject: obj64 from: obj32 - 0 to: (heap64 numSlotsOf: obj64) - 1 do: - [:i| - heap64 - storePointerUnchecked: i - ofObject: obj64 - withValue: (self map32BitOop: (heap32 fetchPointer: i ofObject: obj32))]! Item was removed: - ----- Method: SpurBootstrap32to64>>fillInPointerObjectWithPC:from: (in category 'bootstrap image') ----- - fillInPointerObjectWithPC: obj64 from: obj32 - | method | - self fillInPointerObject: obj64 from: obj32. - (heap64 classIndexOf: obj64) = ClassBlockClosureCompactIndex ifTrue: - [method := heap32 - fetchPointer: MethodIndex - ofObject: (heap32 - fetchPointer: ClosureOuterContextIndex - ofObject: obj32). - self incrementPCField: ClosureStartPCIndex ofObject: obj64 for: method]. - (heap64 classIndexOf: obj64) = ClassMethodContextCompactIndex ifTrue: - [method := heap32 - fetchPointer: MethodIndex - ofObject: obj32. - self incrementPCField: InstructionPointerIndex ofObject: obj64 for: method]! Item was removed: - ----- Method: SpurBootstrap32to64>>incrementPCField:ofObject:for: (in category 'bootstrap image') ----- - incrementPCField: fieldIndex ofObject: obj64 for: method32 - | value nLits | - value := heap64 fetchPointer: fieldIndex ofObject: obj64. - (heap64 isIntegerObject: value) - ifTrue: - [nLits := heap32 literalCountOf: method32. - heap64 - storePointerUnchecked: fieldIndex - ofObject: obj64 - withValue: (heap64 integerObjectOf: nLits + LiteralStart * 4 + (heap64 integerValueOf: value))] - ifFalse: - [self assert: (reverseMap at: value) = heap32 nilObject]! Item was removed: - ----- Method: SpurBootstrap32to64>>initMaps (in category 'initialize-release') ----- - initMaps - map := Dictionary new: heap32 memory size // 32. - reverseMap := Dictionary new: heap32 memory size // 32! Item was removed: - ----- Method: SpurBootstrap32to64>>isUnmappedObject: (in category 'bootstrap image') ----- - isUnmappedObject: obj32 - "Answer if obj32 is an object that is not cloned by the bootstrap." - ^((heap32 classIndexOf: obj32) - between: ClassLargeNegativeIntegerCompactIndex - and: ClassLargePositiveIntegerCompactIndex) - or: [obj32 = heap32 freeListsObject - or: [heap32 isValidObjStackPage: obj32]]! Item was removed: - ----- Method: SpurBootstrap32to64>>map32BitOop: (in category 'bootstrap image') ----- - map32BitOop: oop32 - "interpreter32 printOop: oop32" - ^map - at: oop32 - ifAbsent: - [(heap32 isImmediate: oop32) - ifTrue: - [(heap32 isImmediateCharacter: oop32) - ifTrue: [heap64 characterObjectOf: (heap32 characterValueOf: oop32)] - ifFalse: [heap64 integerObjectOf: (heap32 integerValueOf: oop32)]] - ifFalse: - [| value | - self assert: (self isUnmappedObject: oop32). - interpreter32 initPrimCall. - value := interpreter32 signed64BitValueOf: oop32. - self deny: interpreter32 failed. - heap64 integerObjectOf: value]]! Item was removed: - ----- Method: SpurBootstrap32to64>>on: (in category 'public access') ----- - on: imageName - (interpreter32 := StackInterpreterSimulator newWithOptions: #(ObjectMemory Spur32BitMemoryManager)) - openOn: imageName extraMemory: 0. - heap32 := interpreter32 objectMemory. - imageHeaderFlags := interpreter32 getImageHeaderFlags. - savedWindowSize := interpreter32 savedWindowSize. - interpreter64 := StackInterpreterSimulator newWithOptions: #(ObjectMemory Spur64BitMemoryManager). - heap64 := interpreter64 objectMemory. - heap64 - allocateMemoryOfSize: heap32 oldSpaceSize * 2 - newSpaceSize: 8 * 1024 * 1024 - stackSize: 16 * 1024 - codeSize: 0. - heap64 bootstrapping: true. - self initMaps! Item was removed: - ----- Method: SpurBootstrap32to64>>writeSnapshot:headerFlags:screenSize: (in category 'snapshot') ----- - writeSnapshot: imageFileName headerFlags: headerFlags screenSize: screenSizeInteger - heap64 - checkFreeSpace; - runLeakCheckerForFullGC: true. - interpreter64 - setImageHeaderFlagsFrom: headerFlags; - setDisplayForm: nil; - imageName: imageFileName; - writeImageFileIO. - Transcript cr; show: 'Done!!'! Item was removed: - SpurBootstrap subclass: #SpurBootstrap64 - instanceVariableNames: '' - classVariableNames: '' - poolDictionaries: '' - category: 'Cog-Bootstrapping'! Item was removed: - ----- Method: SpurBootstrap64>>wordSizeMask (in category 'word size') ----- - wordSizeMask - ^7!

1 0

Spur 64-bits. Ugh, this could be a slog...
by Eliot Miranda 19 Nov '14

19 Nov '14

Hi All, I'm making good progress on 64-bit Spur in the Stack VM simulator. But I've just noticed an image-level issue which could be indicative of lots of 32-bit assumptions baked into the Squeal/Pharo/Newspeak systems. SmallInteger>>digitAt: n "Answer the value of an indexable field in the receiver. LargePositiveInteger uses bytes of base two number, and each is a 'digit' base 256. Fail if the argument (the index) is not an Integer or is out of bounds." n>4 ifTrue: [^ 0]. self < 0 ifTrue: [self = SmallInteger minVal ifTrue: ["Can't negate minVal -- treat specially" ^ #(0 0 0 64) at: n]. ^ ((0-self) bitShift: (1-n)*8) bitAnd: 16rFF] ifFalse: [^ (self bitShift: (1-n)*8) bitAnd: 16rFF] This assumes that SmallInteger is only ever 4 bytes, which is unacceptably wasteful for my approach to 64-bits. In 64-bit Spur, SmallIntegers are 61-bit 2's complement. I'm raising this example at this point to see if the community might find similar issues and bring them to my attention. -- best, Eliot

3 7

VM Maker: Cog-eem.219.mcz
by commits＠source.squeak.org 19 Nov '14

19 Nov '14

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.219.mcz ==================== Summary ==================== Name: Cog-eem.219 Author: eem Time: 19 November 2014, 10:07:57.957 am UUID: 99545a1e-d2a6-4793-9a7a-32c0d702320d Ancestors: Cog-eem.218 Spur 32- to 64-bit bootstrap. Get the tests for acceptable 64-bit integers right and add asserts to check the conversions are correct. =============== Diff against Cog-eem.218 =============== Item was changed: ----- Method: SpurBootstrap32to64>>cloneObjects (in category 'bootstrap image') ----- cloneObjects "Clone all normal objects. Of hidden objects only clone the freeLists object and the classTableRoot and class table pages. In particular, dont clone objStacks. The refs to the objStacks are nilled out in fillInHeap." | freeListsObject | freeListsObject := heap32 freeListsObject. heap32 allOldSpaceObjectsDo: [:obj32| | classIndex value | classIndex := heap32 classIndexOf: obj32. obj32 = freeListsObject ifTrue: [self cloneFreeLists: obj32] ifFalse: [(heap32 isValidObjStackPage: obj32) ifFalse: [((classIndex between: ClassLargeNegativeIntegerCompactIndex and: ClassLargePositiveIntegerCompactIndex) and: [interpreter32 initPrimCall. + value := interpreter32 signed64BitValueOf: obj32. - value := heap32 positive64BitValueOf: obj32. interpreter32 failed not and: [heap64 isIntegerValue: value]]) ifFalse: [self clone: obj32]]]]! Item was changed: ----- Method: SpurBootstrap32to64>>fillInCompiledMethod:from: (in category 'bootstrap image') ----- fillInCompiledMethod: obj64 from: obj32 | offset | + "interpreter32 printOop: oop32" + "interpreter64 printOop: oop64" 0 to: (heap32 numPointerSlotsOf: obj32) - 1 do: + [:i| | oop32 oop64 | + oop32 := heap32 fetchPointer: i ofObject: obj32. + oop64 := self map32BitOop: oop32. - [:i| heap64 storePointerUnchecked: i ofObject: obj64 + withValue: oop64. + (heap64 isIntegerObject: oop64) ifTrue: + [interpreter32 initPrimCall. + self assert: (interpreter32 signed64BitValueOf: oop32) = (heap64 integerValueOf: oop64)]]. - withValue: (self map32BitOop: (heap32 fetchPointer: i ofObject: obj32))]. offset := (interpreter64 startPCOfMethod: obj64) - (interpreter32 startPCOfMethod: obj32). (interpreter32 startPCOfMethod: obj32) to: (heap32 numBytesOf: obj32) - 1 + do: [:j| - do: [:i| heap64 + storeByte: offset + j - storeByte: offset + i ofObject: obj64 + withValue: (heap32 fetchByte: j ofObject: obj32)]! - withValue: (heap32 fetchByte: i ofObject: obj32)]! Item was changed: ----- Method: SpurBootstrap32to64>>map32BitOop: (in category 'bootstrap image') ----- map32BitOop: oop32 + "interpreter32 printOop: oop32" ^map at: oop32 ifAbsent: [(heap32 isImmediate: oop32) ifTrue: [(heap32 isImmediateCharacter: oop32) ifTrue: [heap64 characterObjectOf: (heap32 characterValueOf: oop32)] ifFalse: [heap64 integerObjectOf: (heap32 integerValueOf: oop32)]] ifFalse: [| value | self assert: (self isUnmappedObject: oop32). interpreter32 initPrimCall. + value := interpreter32 signed64BitValueOf: oop32. - value := heap32 positive64BitValueOf: oop32. self deny: interpreter32 failed. heap64 integerObjectOf: value]]!

1 0

VM Maker: VMMaker.oscog-eem.943.mcz
by commits＠source.squeak.org 19 Nov '14

19 Nov '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.943.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.943 Author: eem Time: 19 November 2014, 10:01:51.541 am UUID: 3e35700d-2330-4eb4-96fb-22812be23140 Ancestors: VMMaker.oscog-eem.942 Fix the code generator for 64-bit Spur integerValueOf:. Fix 64-bit integerValueOf: integerObjectOf: & isIntegerValue:. Use numBytesOf: instead of lengthOf: in the 64-bit integer conversion routines. Reorder cases in Spur's numBytesOf: to put common case first. =============== Diff against VMMaker.oscog-eem.942 =============== Item was changed: ----- Method: CCodeGenerator>>generateIntegerValueOf:on:indent: (in category 'C translation') ----- generateIntegerValueOf: msgNode on: aStream indent: level "Generate the C code for this message onto the given stream." + aStream nextPut: $(. - aStream nextPutAll: '('. self emitCExpression: msgNode args first on: aStream. + aStream nextPutAll: ' >> '; + print: vmClass objectMemoryClass numSmallIntegerTagBits; + nextPut: $).! - aStream nextPutAll: ' >> 1)'.! Item was changed: ----- Method: InterpreterPrimitives>>magnitude64BitValueOf: (in category 'primitive support') ----- magnitude64BitValueOf: oop "Convert the given object into an integer value. The object may be either a positive SmallInteger or a eight-byte LargeInteger." | sz value ok smallIntValue | <returnTypeC: #usqLong> <var: #value type: #usqLong> (objectMemory isIntegerObject: oop) ifTrue: [smallIntValue := (objectMemory integerValueOf: oop). smallIntValue < 0 ifTrue: [smallIntValue := 0 - smallIntValue]. ^self cCoerce: smallIntValue to: #usqLong]. (objectMemory isNonIntegerImmediate: oop) ifTrue: [^self primitiveFail]. ok := objectMemory isClassOfNonImm: oop equalTo: (objectMemory splObj: ClassLargePositiveInteger) compactClassIndex: ClassLargePositiveIntegerCompactIndex. ok ifFalse: [ok := objectMemory isClassOfNonImm: oop equalTo: (objectMemory splObj: ClassLargeNegativeInteger) compactClassIndex: ClassLargeNegativeIntegerCompactIndex. ok ifFalse: [^self primitiveFail]]. + sz := objectMemory numBytesOf: oop. - sz := objectMemory lengthOf: oop. sz > (self sizeof: #sqLong) ifTrue: [^self primitiveFail]. value := 0. 0 to: sz - 1 do: [:i | value := value + ((self cCoerce: (objectMemory fetchByte: i ofObject: oop) to: #sqLong) << (i*8))]. ^value! Item was changed: ----- Method: InterpreterPrimitives>>positive64BitValueOf: (in category 'primitive support') ----- positive64BitValueOf: oop "Convert the given object into an integer value. The object may be either a positive SmallInteger or an eight-byte LargePositiveInteger." <returnTypeC: #usqLong> | sz value ok | <var: #value type: #usqLong> (objectMemory isIntegerObject: oop) ifTrue: [(objectMemory integerValueOf: oop) < 0 ifTrue: [^self primitiveFail]. ^objectMemory integerValueOf: oop]. (objectMemory isNonIntegerImmediate: oop) ifTrue: [self primitiveFail. ^0]. ok := objectMemory isClassOfNonImm: oop equalTo: (objectMemory splObj: ClassLargePositiveInteger) compactClassIndex: ClassLargePositiveIntegerCompactIndex. + (ok and: [(sz := objectMemory numBytesOf: oop) <= (self sizeof: #sqLong)]) ifFalse: - (ok and: [(sz := objectMemory lengthOf: oop) <= (self sizeof: #sqLong)]) ifFalse: [self primitiveFail. ^0]. value := 0. 0 to: sz - 1 do: [:i | value := value + ((self cCoerce: (objectMemory fetchByte: i ofObject: oop) to: #usqLong) << (i*8))]. ^value! Item was changed: ----- Method: InterpreterPrimitives>>positiveMachineIntegerValueOf: (in category 'primitive support') ----- positiveMachineIntegerValueOf: oop "Answer a value of an integer in address range, i.e up to the size of a machine word. The object may be either a positive SmallInteger or a LargePositiveInteger of size <= word size." <returnTypeC: #'unsigned long'> <inline: true> "only two callers & one is primitiveNewWithArg" | value bs ok | (objectMemory isIntegerObject: oop) ifTrue: [value := objectMemory integerValueOf: oop. value < 0 ifTrue: [^self primitiveFail]. ^value]. (objectMemory isNonIntegerImmediate: oop) ifTrue: [^self primitiveFail]. ok := objectMemory isClassOfNonImm: oop equalTo: (objectMemory splObj: ClassLargePositiveInteger) compactClassIndex: ClassLargePositiveIntegerCompactIndex. + (ok and: [(bs := objectMemory numBytesOf: oop) <= (self sizeof: #'unsigned long')]) ifFalse: - (ok and: [(bs := objectMemory lengthOf: oop) <= (self sizeof: #'unsigned long')]) ifFalse: [^self primitiveFail]. ((self sizeof: #'unsigned long') = 8 and: [bs > 4]) ifTrue: [^ (objectMemory fetchByte: 0 ofObject: oop) + ((objectMemory fetchByte: 1 ofObject: oop) << 8) + ((objectMemory fetchByte: 2 ofObject: oop) << 16) + ((objectMemory fetchByte: 3 ofObject: oop) << 24) + ((objectMemory fetchByte: 4 ofObject: oop) << 32) + ((objectMemory fetchByte: 5 ofObject: oop) << 40) + ((objectMemory fetchByte: 6 ofObject: oop) << 48) + ((objectMemory fetchByte: 7 ofObject: oop) << 56)]. ^ (objectMemory fetchByte: 0 ofObject: oop) + ((objectMemory fetchByte: 1 ofObject: oop) << 8) + ((objectMemory fetchByte: 2 ofObject: oop) << 16) + ((objectMemory fetchByte: 3 ofObject: oop) << 24)! Item was changed: ----- Method: InterpreterPrimitives>>signed64BitValueOf: (in category 'primitive support') ----- signed64BitValueOf: oop "Convert the given object into an integer value. + The object may be either a positive SmallInteger or a eight-byte LargeInteger." - The object may be either a positive SmallInteger or a eight-byte LargeInteger." | sz value negative ok | <inline: false> <returnTypeC: #sqLong> <var: #value type: #sqLong> (objectMemory isIntegerObject: oop) ifTrue: [^self cCoerce: (objectMemory integerValueOf: oop) to: #sqLong]. (objectMemory isNonIntegerImmediate: oop) ifTrue: [^self primitiveFail]. ok := objectMemory isClassOfNonImm: oop equalTo: (objectMemory splObj: ClassLargePositiveInteger) compactClassIndex: ClassLargePositiveIntegerCompactIndex. ok ifTrue: [negative := false] ifFalse: [negative := true. ok := objectMemory isClassOfNonImm: oop equalTo: (objectMemory splObj: ClassLargeNegativeInteger) compactClassIndex: ClassLargeNegativeIntegerCompactIndex. ok ifFalse: [^self primitiveFail]]. + sz := objectMemory numBytesOf: oop. - sz := objectMemory lengthOf: oop. sz > (self sizeof: #sqLong) ifTrue: [^self primitiveFail]. value := 0. 0 to: sz - 1 do: [:i | value := value + ((self cCoerce: (objectMemory fetchByte: i ofObject: oop) to: #sqLong) << (i*8))]. "Filter out values out of range for the signed interpretation such as 16rFFFFFFFF... (positive w/ bit 64 set) and -16rFFFFFFFF... (negative w/ bit 64 set). Since the sign is implicit in the class we require that the high bit of the magnitude is not set which is a simple test here. Note that we have to handle the most negative 64-bit value -9223372036854775808 specially." self cCode: [] inSmalltalk: [(value anyMask: 16r8000000000000000) ifTrue: [value := value - 16r10000000000000000]]. value < 0 ifTrue: [self cCode: [self assert: (self sizeof: value) == 8. self assert: (self sizeof: value << 1) == 8]. "Don't fail for -9223372036854775808/-16r8000000000000000. Alas the simple (negative and: [value - 1 > 0]) isn't adequate since in C the result of signed integer + overflow is undefined and hence under optimization this may fail. The shift, however, is well-defined." - overflow is undefined and hence under optimization this may fail. The shift, however, is well-defined." (negative and: [0 = (self cCode: [value << 1] inSmalltalk: [value << 1 bitAnd: (1 << 64) - 1])]) ifTrue: [^value]. ^self primitiveFail]. ^negative ifTrue:[0 - value] ifFalse:[value]! Item was changed: ----- Method: InterpreterPrimitives>>signedMachineIntegerValueOf: (in category 'primitive support') ----- signedMachineIntegerValueOf: oop "Answer a signed value of an integer up to the size of a machine word. The object may be either a positive SmallInteger or a LargeInteger of size <= word size." <returnTypeC: #'long'> | negative ok bs value bits | <var: #value type: #long> (objectMemory isIntegerObject: oop) ifTrue: [^objectMemory integerValueOf: oop]. (objectMemory isNonIntegerImmediate: oop) ifTrue: [^self primitiveFail]. ok := objectMemory isClassOfNonImm: oop equalTo: (objectMemory splObj: ClassLargePositiveInteger) compactClassIndex: ClassLargePositiveIntegerCompactIndex. ok ifTrue: [negative := false] ifFalse: [negative := true. ok := objectMemory isClassOfNonImm: oop equalTo: (objectMemory splObj: ClassLargeNegativeInteger) compactClassIndex: ClassLargeNegativeIntegerCompactIndex. ok ifFalse: [^self primitiveFail]]. + bs := objectMemory numBytesOf: oop. + bs > (self sizeof: #'unsigned long') ifTrue: - (bs := objectMemory lengthOf: oop) > (self sizeof: #'unsigned long') ifTrue: [^self primitiveFail]. ((self sizeof: #'unsigned long') = 8 and: [bs > 4]) ifTrue: [value := (objectMemory fetchByte: 0 ofObject: oop) + ((objectMemory fetchByte: 1 ofObject: oop) << 8) + ((objectMemory fetchByte: 2 ofObject: oop) << 16) + ((objectMemory fetchByte: 3 ofObject: oop) << 24) + ((objectMemory fetchByte: 4 ofObject: oop) << 32) + ((objectMemory fetchByte: 5 ofObject: oop) << 40) + ((objectMemory fetchByte: 6 ofObject: oop) << 48) + ((objectMemory fetchByte: 7 ofObject: oop) << 56)] ifFalse: [value := (objectMemory fetchByte: 0 ofObject: oop) + ((objectMemory fetchByte: 1 ofObject: oop) << 8) + ((objectMemory fetchByte: 2 ofObject: oop) << 16) + ((objectMemory fetchByte: 3 ofObject: oop) << 24)]. self cCode: [] inSmalltalk: [bits := (self sizeof: #long) * 8. (value bitShift: 1 - bits) > 0 ifTrue: [value := value - (1 bitShift: bits)]]. value < 0 ifTrue: ["Don't fail for -16r80000000[00000000]. Alas the simple (negative and: [value - 1 > 0]) isn't adequate since in C the result of signed integer overflow is undefined and hence under optimization this may fail. The shift, however, is well-defined." (negative and: [0 = (self cCode: [value << 1] inSmalltalk: [value << 1 bitAnd: (1 << bits) - 1])]) ifTrue: [^value]. ^self primitiveFail]. ^negative ifTrue: [0 - value] ifFalse: [value]! Item was changed: ----- Method: Spur64BitMemoryManager>>integerObjectOf: (in category 'immediates') ----- integerObjectOf: value "Convert the integer value, assumed to be in SmallInteger range, into a tagged SmallInteger object. In C, use a shift and an add to set the tag bit. In Smalltalk we have to work harder because the simulator works with strictly positive bit patterns." <returnTypeC: #sqInt> ^self cCode: [value << self numTagBits + 1] inSmalltalk: [value << self numTagBits + (value >= 0 ifTrue: [1] + ifFalse: [16r10000000000000001])]! - ifFalse: [16r8000000000000001])]! Item was changed: ----- Method: Spur64BitMemoryManager>>integerValueOf: (in category 'immediates') ----- integerValueOf: oop + "Translator produces 'oop >> 3'" - "Translator produces 'oop >> 1'" ^(oop bitShift: -63) = 1 "tests top bit" ifTrue: "negative" + [((oop bitShift: self numTagBits negated) bitAnd: 16r1FFFFFFFFFFFFFFF) - 16r1FFFFFFFFFFFFFFF - 1 "Faster than -16r4000000000000000 (a LgInt)"] - [((oop bitShift: self numTagBits negated) bitAnd: 16r3FFFFFFFFFFFFFFF) - 16r3FFFFFFFFFFFFFFF - 1 "Faster than -16r4000000000000000 (a LgInt)"] ifFalse: "positive" [oop bitShift: self numTagBits negated]! Item was changed: ----- Method: Spur64BitMemoryManager>>isIntegerValue: (in category 'interpreter access') ----- isIntegerValue: intValue "Answer if the given value can be represented as a Smalltalk integer value. In 64-bits we use a 3 bit tag which leaves 61 bits for 2's complement signed integers. In C, use a shift add and mask to test if the top 4 bits are all the same." <api> ^self cCode: [(intValue >> 60 + 1 bitAnd: 16rF) <= 1] + inSmalltalk: [intValue >= -16r1000000000000000 and: [intValue <= 16rFFFFFFFFFFFFFFF]]! - inSmalltalk: [intValue >= -16r2000000000000000 and: [intValue <= 16r1FFFFFFFFFFFFFFF]]! Item was changed: ----- Method: SpurMemoryManager>>numBytesOf: (in category 'object access') ----- numBytesOf: objOop "Answer the number of indexable bytes in the given non-immediate object. Does not adjust the size of contexts by stackPointer." <api> | fmt numBytes | <inline: true> fmt := self formatOf: objOop. numBytes := self numSlotsOf: objOop. numBytes := numBytes << self shiftForWord. + fmt >= self firstByteFormat ifTrue: "bytes (the common case), including CompiledMethod" + [^numBytes - (fmt bitAnd: 7)]. fmt <= self sixtyFourBitIndexableFormat ifTrue: [^numBytes]. - fmt >= self firstByteFormat ifTrue: "bytes, including CompiledMethod" - [^numBytes - (fmt bitAnd: 7)]. fmt >= self firstShortFormat ifTrue: [^numBytes - ((fmt bitAnd: 3) << 1)]. "fmt >= self firstLongFormat" ^numBytes - ((fmt bitAnd: 1) << 2)!

1 0

VM Maker: VMMaker.oscog-eem.942.mcz
by commits＠source.squeak.org 19 Nov '14

19 Nov '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.942.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.942 Author: eem Time: 18 November 2014, 6:45:04.634 pm UUID: 0e7b390b-5dac-4ff1-84a3-55e02ad8de11 Ancestors: VMMaker.oscog-eem.941 64-bit-ise access to method primitive numbers. Nuke obsolete ImmediateTagMask & SmallIntegerShift constants in VMSqueakV3ObjectRepresentationConstants and remove its use in InterpreterPrimtiives and StackInterpreter. 64-bit Spur now executes as far as the first bitShift: primitive, 161 bytecodes in. =============== Diff against VMMaker.oscog-eem.941 =============== Item was changed: VMClass subclass: #InterpreterPrimitives instanceVariableNames: 'objectMemory messageSelector argumentCount newMethod primFailCode profileMethod profileProcess profileSemaphore nextProfileTick preemptionYields' classVariableNames: 'CrossedX EndOfRun MillisecondClockMask' + poolDictionaries: 'VMBasicConstants VMMethodCacheConstants VMObjectIndices VMSqueakClassIndices VMSqueakV3BytecodeConstants VMStackFrameOffsets' - poolDictionaries: 'VMBasicConstants VMMethodCacheConstants VMObjectIndices VMSqueakClassIndices VMSqueakV3BytecodeConstants VMSqueakV3ObjectRepresentationConstants VMStackFrameOffsets' category: 'VMMaker-Interpreter'! !InterpreterPrimitives commentStamp: 'eem 12/11/2012 17:11' prior: 0! InterpreterPrimitives implements most of the VM's core primitives. It is the root of the interpreter hierarchy so as to share the core primitives amongst the varioius interpreters. Instance Variables argumentCount: <Integer> messageSelector: <Integer> newMethod: <Integer> nextProfileTick: <Integer> objectMemory: <ObjectMemory> (simulation only) preemptionYields: <Boolean> primFailCode: <Integer> profileMethod: <Integer> profileProcess: <Integer> profileSemaphore: <Integer> argumentCount - the number of arguments of the current message messageSelector - the oop of the selector of the current message newMethod - the oop of the result of looking up the current message nextProfileTick - the millisecond clock value of the next profile tick (if profiling is in effect) objectMemory - the memory manager and garbage collector that manages the heap preemptionYields - a boolean controlling the process primitives. If true (old, incorrect, blue-book semantics) a preempted process is sent to the back of its run-queue. If false, a process preempted by a higher-priority process is put back at the head of its run queue, hence preserving cooperative scheduling within priorities. primFailCode - primtiive success/failure flag, 0 for success, otherwise the reason code for failure profileMethod - the oop of the method at the time nextProfileTick was reached profileProcess - the oop of the activeProcess at the time nextProfileTick was reached profileSemaphore - the oop of the semaphore to signal when nextProfileTick is reached ! Item was removed: - ----- Method: ObjectMemory class>>initializeImmediates (in category 'initialization') ----- - initializeImmediates - "The Squeak VM supports 31-bit immediate 2's compliment SmallInteger objects as the only immediate type." - ImmediateTagMask := SmallIntegerShift := 1! Item was changed: ----- Method: ObjectMemory class>>initializeWithOptions: (in category 'initialization') ----- initializeWithOptions: optionsDictionary "ObjectMemory initializeWithOptions: Dictionary new" self initBytesPerWord: (optionsDictionary at: #BytesPerWord ifAbsent: [4]). BytesPerOop := optionsDictionary at: #BytesPerOop ifAbsent: [BytesPerWord]. "Translation flags (booleans that control code generation via conditional translation):" "generate assertion checks" DoAssertionChecks := optionsDictionary at: #DoAssertionChecks ifAbsent: [false]. DoExpensiveAssertionChecks := optionsDictionary at: #DoExpensiveAssertionChecks ifAbsent: [false]. self initializeObjectHeaderConstants. "Initializes BaseHeaderSize so do early" - self initializeImmediates. self initializeSpecialObjectIndices. self initializeCompactClassIndices. self initializePrimitiveErrorCodes. NilContext := 1. "the oop for the integer 0; used to mark the end of context lists" RemapBufferSize := 25. RootTableSize := 2500. "number of root table entries (4 bytes/entry)" RootTableRedZone := RootTableSize - 100. "red zone of root table - when reached we force IGC" WeakRootTableSize := RootTableSize + RemapBufferSize + 100. "tracer actions" StartField := 1. StartObj := 2. Upward := 3. Done := 4. ExtraRootSize := 2048. "max. # of external roots"! Item was changed: InterpreterPrimitives subclass: #StackInterpreter instanceVariableNames: 'currentBytecode bytecodeSetSelector localFP localIP localSP stackLimit stackPage stackPages method instructionPointer stackPointer framePointer localReturnValue extA extB primitiveFunctionPointer methodCache atCache lkupClassTag lkupClass methodDictLinearSearchLimit highestRunnableProcessPriority nextWakeupUsecs nextPollUsecs inIOProcessEvents interruptKeycode interruptPending savedWindowSize imageHeaderFlags fullScreenFlag deferDisplayUpdates pendingFinalizationSignals extraVMMemory interpreterProxy showSurfaceFn primitiveTable primitiveAccessorDepthTable externalPrimitiveTable externalPrimitiveTableFirstFreeIndex overflowedPage extraFramesToMoveOnOverflow globalSessionID jmpBuf jmpDepth suspendedCallbacks suspendedMethods numStackPages desiredNumStackPages desiredEdenBytes classNameIndex thisClassIndex metaclassNumSlots interruptCheckChain suppressHeartbeatFlag breakSelector breakSelectorLength longRunningPrimitiveCheckMethod longRunningPrimitiveCheckSemaphore longRunningPrimitiveStartUsecs longRunningPrimitiveStopUsecs longRunningPrimitiveGCUsecs longRunningPrimitiveCheckSequenceNumber longRunningPrimitiveSignalUndelivered checkAllocFiller tempOop tempOop2 theUnknownShort the2ndUnknownShort imageFloatsBigEndian maxExtSemTabSizeSet lastMethodCacheProbeWrite gcSemaphoreIndex classByteArrayCompactIndex statForceInterruptCheck statStackOverflow statStackPageDivorce statCheckForEvents statProcessSwitch statIOProcessEvents statPendingFinalizationSignals' + classVariableNames: 'AltBytecodeEncoderClassName AltLongStoreBytecode AlternateHeaderHasPrimFlag AtCacheEntries AtCacheFixedFields AtCacheFmt AtCacheMask AtCacheOop AtCacheSize AtCacheTotalSize AtPutBase BytecodeEncoderClassName BytecodeTable CacheProbeMax DirBadPath DirEntryFound DirNoMoreEntries DumpStackOnLowSpace EnclosingMixinIndex EnclosingObjectIndex FailImbalancedPrimitives HeaderFlagBitPosition LongStoreBytecode MaxExternalPrimitiveTableSize MaxJumpBuf MaxPrimitiveIndex MaxQuickPrimitiveIndex MethodHeaderArgCountShift MethodHeaderTempCountShift MixinIndex PrimitiveExternalCallIndex PrimitiveTable StackPageReachedButUntraced StackPageTraceInvalid StackPageTraced StackPageUnreached V3PrimitiveBitsMask' + poolDictionaries: 'VMBasicConstants VMMethodCacheConstants VMObjectIndices VMSpurObjectRepresentationConstants VMSqueakClassIndices VMSqueakV3BytecodeConstants VMStackFrameOffsets' - classVariableNames: 'AltBytecodeEncoderClassName AltLongStoreBytecode AtCacheEntries AtCacheFixedFields AtCacheFmt AtCacheMask AtCacheOop AtCacheSize AtCacheTotalSize AtPutBase BytecodeEncoderClassName BytecodeTable CacheProbeMax DirBadPath DirEntryFound DirNoMoreEntries DumpStackOnLowSpace EnclosingMixinIndex EnclosingObjectIndex FailImbalancedPrimitives HeaderFlagBitPosition LongStoreBytecode MaxExternalPrimitiveTableSize MaxJumpBuf MaxPrimitiveIndex MaxQuickPrimitiveIndex MethodHeaderArgCountShift MethodHeaderTempCountShift MixinIndex PrimitiveExternalCallIndex PrimitiveTable StackPageReachedButUntraced StackPageTraceInvalid StackPageTraced StackPageUnreached' - poolDictionaries: 'VMBasicConstants VMMethodCacheConstants VMObjectIndices VMSpurObjectRepresentationConstants VMSqueakClassIndices VMSqueakV3BytecodeConstants VMSqueakV3ObjectRepresentationConstants VMStackFrameOffsets' category: 'VMMaker-Interpreter'! !StackInterpreter commentStamp: 'eem 9/11/2013 18:30' prior: 0! This class is a complete implementation of the Smalltalk-80 virtual machine, derived originally from the Blue Book specification but quite different in some areas. This VM supports Closures but *not* old-style BlockContexts. It has been modernized with 32-bit pointers, better management of Contexts (see next item), and attention to variable use that allows the CCodeGenerator (qv) to keep, eg, the instruction pointer and stack pointer in registers as well as keeping most simple variables in a global array that seems to improve performance for most platforms. The VM does not use Contexts directly. Instead Contexts serve as proxies for a more conventional stack format that is invisible to the image. There is considerable explanation at http://www.mirandabanda.org/cogblog/2009/01/14/under-cover-contexts-and-the…. The VM maintains a fixed-size stack zone divided into pages, each page being capable of holding several method/block activations. A send establishes a new frame in the current stack page, a return returns to the previous frame. This eliminates allocation/deallocation of contexts and the moving of receiver and arguments from caller to callee on each send/return. Contexts are created lazily when an activation needs a context (creating a block, explicit use of thisContext, access to sender when sender is a frame, or linking of stack pages together). Contexts are either conventional and heap-resident ("single") or "married" and serve as proxies for their corresponding frame or "widowed", meaning that their spouse frame has been returned from (died). A married context is specially marked (more details in the code) and refers to its frame. Likewise a married frame is specially marked and refers to its context. In addition to SmallInteger arithmetic and Floats, the VM supports logic on 32-bit PositiveLargeIntegers, thus allowing it to simulate itself much more effectively than would otherwise be the case. NOTE: Here follows a list of things to be borne in mind when working on this code, or when making changes for the future. 1. There are a number of things that should be done the next time we plan to release a completely incompatible image format. These include unifying the instanceSize field of the class format word -- see instantiateClass:indexableSize:, and unifying the bits of the method primitive index (if we decide we need more than 512, after all) -- see primitiveIndexOf:. Also, contexts should be given a special format code (see next item). 2. There are several fast checks for contexts (see isContextHeader: and isMethodContextHeader:) which will fail if the compact class indices of BlockContext or MethodContext change. This is necessary because the oops may change during a compaction when the oops are being adjusted. It's important to be aware of this when writing a new image using the SystemTracer. A better solution would be to reserve one of the format codes for Contexts only. An even better solution is to eliminate compact classes altogether (see 6.). 3. We have made normal files tolerant to size and positions up to 32 bits. This has not been done for async files, since they are still experimental. The code in size, at: and at:put: should work with sizes and indices up to 31 bits, although I have not tested it (di 12/98); it might or might not work with 32-bit sizes. [Late news, the support has been extended to 64-bit file sizes]. 4. Note that 0 is used in a couple of places as an impossible oop. This should be changed to a constant that really is impossible (or perhaps there is code somewhere that guarantees it --if so it should be put in this comment). The places include the method cache and the at cache. 5. Moving to a 2 bit immediate tag and having immediate Characters is a good choice for Unicode and the JIT. We can still have 31-bit SmallIntegers by allowing two tag patterns for SmallInteger. 6. If Eliot Miranda's 2 word header scheme is acceptable in terms of footprint (we estimate about a 10% increase in image size with about 35 reclaimed by better representation of CompiledMethod - loss of MethodProperties) then the in-line cache for the JIT is simplified, class access is faster and header access is the same in 32-bit and full 64-bit images. [Late breaking news, the 2-word header scheme is more compact, by over 2%]. See SpurMemorymanager's class comment.! Item was changed: ----- Method: StackInterpreter class>>initializeMethodIndices (in category 'initialization') ----- initializeMethodIndices | tagBits | "Class CompiledMethod" HeaderIndex := 0. LiteralStart := 1. tagBits := self objectMemoryClass numSmallIntegerTagBits. LargeContextBit := 16r20000 << tagBits. "This bit set in method headers if large context is needed." MethodHeaderTempCountShift := 18 + tagBits. MethodHeaderArgCountShift := 24 + tagBits. + V3PrimitiveBitsMask := 16r100001FF << tagBits. + AlternateHeaderHasPrimFlag := 16r10000 << tagBits. "The position of the unused flag bit in the method header, not including tag bit(s)" HeaderFlagBitPosition := 29! Item was changed: ----- Method: StackInterpreter>>alternateHeaderHasPrimitiveFlag: (in category 'compiled methods') ----- alternateHeaderHasPrimitiveFlag: methodHeader <inline: true> + ^methodHeader anyMask: AlternateHeaderHasPrimFlag! - ^methodHeader anyMask: 16r10000 << SmallIntegerShift! Item was changed: ----- Method: StackInterpreter>>literalCountOfAlternateHeader: (in category 'compiled methods') ----- literalCountOfAlternateHeader: headerPointer <inline: true> + ^(objectMemory integerValueOf: headerPointer) bitAnd: 16rFFFF! - ^(headerPointer >> 1) bitAnd: 16rFFFF! Item was changed: ----- Method: StackInterpreter>>methodHeaderHasPrimitive: (in category 'compiled methods') ----- methodHeaderHasPrimitive: methodHeader "Note: We now have 10 bits of primitive index, but they are in two places for temporary backward compatibility. The time to unpack is negligible, since the derived primitive function pointer is stored in the method cache." ^objectMemory hasSpurMemoryManagerAPI ifTrue: [self alternateHeaderHasPrimitiveFlag: methodHeader] ifFalse: [MULTIPLEBYTECODESETS ifTrue: [(self headerIndicatesAlternateBytecodeSet: methodHeader) ifTrue: [self alternateHeaderHasPrimitiveFlag: methodHeader] + ifFalse: [methodHeader anyMask: V3PrimitiveBitsMask]] - ifFalse: [(methodHeader bitAnd: 16r200003FE) ~= 0]] ifFalse: + [methodHeader anyMask: V3PrimitiveBitsMask]]! - [(methodHeader bitAnd: 16r200003FE) ~= 0]]! Item was changed: ----- Method: StackInterpreter>>primitiveIndexOfMethod:header: (in category 'compiled methods') ----- primitiveIndexOfMethod: theMethod header: methodHeader "Note: With the Squeak V0 format we now have 10 bits of primitive index, but they are in two places for temporary backward compatibility. The time to unpack is negligible, since the derived primitive function pointer is stored in the method cache. With the new format we assume a 3-byte CallPrimitive with a little-endian 16-bit primitive index." <api> <inline: true> | firstBytecode | ^objectMemory hasSpurMemoryManagerAPI ifTrue: [(self alternateHeaderHasPrimitiveFlag: methodHeader) ifTrue: [firstBytecode := self firstBytecodeOfAlternateHeader: methodHeader method: theMethod. (objectMemory byteAt: firstBytecode + 1) + ((objectMemory byteAt: firstBytecode + 2) << 8)] ifFalse: [0]] ifFalse: [MULTIPLEBYTECODESETS ifTrue: [(self headerIndicatesAlternateBytecodeSet: methodHeader) ifTrue: [(self alternateHeaderHasPrimitiveFlag: methodHeader) ifTrue: [firstBytecode := self firstBytecodeOfAlternateHeader: methodHeader method: theMethod. (objectMemory byteAt: firstBytecode + 1) + ((objectMemory byteAt: firstBytecode + 2) << 8)] ifFalse: [0]] ifFalse: [| primBits | primBits := objectMemory integerValueOf: methodHeader. (primBits bitAnd: 16r1FF) + (primBits >> 19 bitAnd: 16r200)]] ifFalse: [| primBits | primBits := objectMemory integerValueOf: methodHeader. (primBits bitAnd: 16r1FF) + (primBits >> 19 bitAnd: 16r200)]]! Item was changed: VMBasicConstants subclass: #VMSqueakV3ObjectRepresentationConstants instanceVariableNames: '' + classVariableNames: 'AllButTypeMask CompactClassMask HashBitsOffset HashMaskUnshifted HeaderTypeShort HeaderTypeSizeAndClass ImmutabilityBit LongSizeMask MarkBit RootBit Size4Bit SizeMask TypeMask' - classVariableNames: 'AllButTypeMask CompactClassMask HashBitsOffset HashMaskUnshifted HeaderTypeShort HeaderTypeSizeAndClass ImmediateTagMask ImmutabilityBit LongSizeMask MarkBit RootBit Size4Bit SizeMask SmallIntegerShift TypeMask' poolDictionaries: '' category: 'VMMaker-Interpreter'! !VMSqueakV3ObjectRepresentationConstants commentStamp: '<historical>' prior: 0! I am a shared pool for the constants that define the Squeak V3 object representation shared between the object memories (e.g. ObjectMemory, NewObjectMemory), the interpreters (e.g. StackInterpreter, CoInterpreter) and the object representations (e.g. ObjectRepresentationForSqueakV3). self ensureClassPool self classPool declare: #AllButTypeMask from: VMObjectOffsets classPool (ObjectMemory classPool keys select: [:k| k includesSubString: 'Compact']) do: [:k| self classPool declare: k from: ObjectMemory classPool]!

1 0

VM Maker: VMMaker.oscog-eem.941.mcz
by commits＠source.squeak.org 19 Nov '14

19 Nov '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.941.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.941 Author: eem Time: 18 November 2014, 6:13:23.662 pm UUID: 729c5ae6-4737-4218-905d-063cc7afb645 Ancestors: VMMaker.oscog-eem.940 64-bit-ise string printing and method header numArgs and numTemps access. =============== Diff against VMMaker.oscog-eem.940 =============== Item was changed: ----- Method: CoInterpreter>>internalActivateNewMethod (in category 'message sending') ----- internalActivateNewMethod | methodHeader numTemps rcvr errorCode switched | <inline: true> methodHeader := self rawHeaderOf: newMethod. self assert: (self isCogMethodReference: methodHeader) not. numTemps := self temporaryCountOfMethodHeader: methodHeader. + self assert: argumentCount = (self argumentCountOfMethodHeader: methodHeader). - rcvr := self internalStackValue: argumentCount. "could new rcvr be set at point of send?" self assert: (objectMemory isOopForwarded: rcvr) not. self internalPush: localIP. self internalPush: localFP. localFP := localSP. self internalPush: newMethod. self setMethod: newMethod methodHeader: methodHeader. self internalPush: objectMemory nilObject. "FxThisContext field" self internalPush: (self encodeFrameFieldHasContext: false isBlock: false numArgs: (self argumentCountOfMethodHeader: methodHeader)). self internalPush: 0. "FoxIFSavedIP" self internalPush: rcvr. "Initialize temps..." argumentCount + 1 to: numTemps do: [:i | self internalPush: objectMemory nilObject]. "-1 to account for pre-increment in fetchNextBytecode" localIP := self pointerForOop: (self initialPCForHeader: methodHeader method: newMethod) - 1. (self methodHeaderHasPrimitive: methodHeader) ifTrue: ["Skip the CallPrimitive bytecode, if it's there, and store the error code if the method starts with a long store temp. Strictly no need to skip the store because it's effectively a noop." localIP := localIP + (self sizeOfCallPrimitiveBytecode: methodHeader). primFailCode ~= 0 ifTrue: [(objectMemory byteAt: localIP + 1) = (self longStoreBytecodeForHeader: methodHeader) ifTrue: [errorCode := self getErrorObjectFromPrimFailCode. self internalStackTopPut: errorCode "nil if primFailCode == 1, or primFailCode"]. primFailCode := 0]]. self assert: (self frameNumArgs: localFP) == argumentCount. self assert: (self frameIsBlockActivation: localFP) not. self assert: (self frameHasContext: localFP) not. "Now check for stack overflow or an event (interrupt, must scavenge, etc)." localSP < stackLimit ifTrue: [self externalizeIPandSP. switched := self handleStackOverflowOrEventAllowContextSwitch: (self canContextSwitchIfActivating: newMethod header: methodHeader). self returnToExecutive: true postContextSwitch: switched. self internalizeIPandSP]! Item was changed: ----- Method: CogVMSimulatorLSB>>charsOfLong: (in category 'debug support') ----- charsOfLong: long + ^ (1 to: objectMemory wordSize) collect: - ^ (1 to: 4) collect: [:i | ((long digitAt: i) between: 14 and: 126) ifTrue: [(long digitAt: i) asCharacter] ifFalse: [$?]]! Item was removed: - ----- Method: NewCoObjectMemorySimulatorLSB>>charsOfLong: (in category 'debug support') ----- - charsOfLong: long - ^ (1 to: 4) collect: - [:i | ((long digitAt: i) between: 14 and: 126) - ifTrue: [(long digitAt: i) asCharacter] - ifFalse: [$?]]! Item was removed: - ----- Method: NewCoObjectMemorySimulatorMSB>>charsOfLong: (in category 'debug support') ----- - charsOfLong: long - ^ (self wordSize to: 1 by: -1) collect: - [:i | ((long digitAt: i) between: 14 and: 126) - ifTrue: [(long digitAt: i) asCharacter] - ifFalse: [$?]]! Item was removed: - ----- Method: NewObjectMemorySimulatorLSB>>charsOfLong: (in category 'debug support') ----- - charsOfLong: long - ^ (1 to: 4) collect: - [:i | ((long digitAt: i) between: 14 and: 126) - ifTrue: [(long digitAt: i) asCharacter] - ifFalse: [$?]]! Item was removed: - ----- Method: NewObjectMemorySimulatorMSB>>charsOfLong: (in category 'debug support') ----- - charsOfLong: long - ^ (self wordSize to: 1 by: -1) collect: - [:i | ((long digitAt: i) between: 14 and: 126) - ifTrue: [(long digitAt: i) asCharacter] - ifFalse: [$?]]! Item was added: + ----- Method: ObjectMemory class>>numSmallIntegerTagBits (in category 'accessing') ----- + numSmallIntegerTagBits + ^1! Item was added: + ----- Method: ObjectMemory>>numSmallIntegerTagBits (in category 'interpreter access') ----- + numSmallIntegerTagBits + ^1! Item was added: + ----- Method: Spur32BitMemoryManager class>>numSmallIntegerTagBits (in category 'simulation only') ----- + numSmallIntegerTagBits + ^1! Item was added: + ----- Method: Spur32BitMemoryManager>>numSmallIntegerTagBits (in category 'interpreter access') ----- + numSmallIntegerTagBits + ^1! Item was added: + ----- Method: Spur64BitMemoryManager class>>numSmallIntegerTagBits (in category 'simulation only') ----- + numSmallIntegerTagBits + ^3! Item was added: + ----- Method: Spur64BitMemoryManager>>numSmallIntegerTagBits (in category 'interpreter access') ----- + numSmallIntegerTagBits + ^3! Item was added: + ----- Method: SpurMemoryManager class>>numSmallIntegerTagBits (in category 'accessing') ----- + numSmallIntegerTagBits + ^self subclassResponsibility! Item was added: + ----- Method: SpurMemoryManager>>numSmallIntegerTagBits (in category 'interpreter access') ----- + numSmallIntegerTagBits + ^self subclassResponsibility! Item was changed: InterpreterPrimitives subclass: #StackInterpreter instanceVariableNames: 'currentBytecode bytecodeSetSelector localFP localIP localSP stackLimit stackPage stackPages method instructionPointer stackPointer framePointer localReturnValue extA extB primitiveFunctionPointer methodCache atCache lkupClassTag lkupClass methodDictLinearSearchLimit highestRunnableProcessPriority nextWakeupUsecs nextPollUsecs inIOProcessEvents interruptKeycode interruptPending savedWindowSize imageHeaderFlags fullScreenFlag deferDisplayUpdates pendingFinalizationSignals extraVMMemory interpreterProxy showSurfaceFn primitiveTable primitiveAccessorDepthTable externalPrimitiveTable externalPrimitiveTableFirstFreeIndex overflowedPage extraFramesToMoveOnOverflow globalSessionID jmpBuf jmpDepth suspendedCallbacks suspendedMethods numStackPages desiredNumStackPages desiredEdenBytes classNameIndex thisClassIndex metaclassNumSlots interruptCheckChain suppressHeartbeatFlag breakSelector breakSelectorLength longRunningPrimitiveCheckMethod longRunningPrimitiveCheckSemaphore longRunningPrimitiveStartUsecs longRunningPrimitiveStopUsecs longRunningPrimitiveGCUsecs longRunningPrimitiveCheckSequenceNumber longRunningPrimitiveSignalUndelivered checkAllocFiller tempOop tempOop2 theUnknownShort the2ndUnknownShort imageFloatsBigEndian maxExtSemTabSizeSet lastMethodCacheProbeWrite gcSemaphoreIndex classByteArrayCompactIndex statForceInterruptCheck statStackOverflow statStackPageDivorce statCheckForEvents statProcessSwitch statIOProcessEvents statPendingFinalizationSignals' + classVariableNames: 'AltBytecodeEncoderClassName AltLongStoreBytecode AtCacheEntries AtCacheFixedFields AtCacheFmt AtCacheMask AtCacheOop AtCacheSize AtCacheTotalSize AtPutBase BytecodeEncoderClassName BytecodeTable CacheProbeMax DirBadPath DirEntryFound DirNoMoreEntries DumpStackOnLowSpace EnclosingMixinIndex EnclosingObjectIndex FailImbalancedPrimitives HeaderFlagBitPosition LongStoreBytecode MaxExternalPrimitiveTableSize MaxJumpBuf MaxPrimitiveIndex MaxQuickPrimitiveIndex MethodHeaderArgCountShift MethodHeaderTempCountShift MixinIndex PrimitiveExternalCallIndex PrimitiveTable StackPageReachedButUntraced StackPageTraceInvalid StackPageTraced StackPageUnreached' - classVariableNames: 'AltBytecodeEncoderClassName AltLongStoreBytecode AtCacheEntries AtCacheFixedFields AtCacheFmt AtCacheMask AtCacheOop AtCacheSize AtCacheTotalSize AtPutBase BytecodeEncoderClassName BytecodeTable CacheProbeMax DirBadPath DirEntryFound DirNoMoreEntries DumpStackOnLowSpace EnclosingMixinIndex EnclosingObjectIndex FailImbalancedPrimitives HeaderFlagBitPosition LongStoreBytecode MaxExternalPrimitiveTableSize MaxJumpBuf MaxPrimitiveIndex MaxQuickPrimitiveIndex MixinIndex PrimitiveExternalCallIndex PrimitiveTable StackPageReachedButUntraced StackPageTraceInvalid StackPageTraced StackPageUnreached' poolDictionaries: 'VMBasicConstants VMMethodCacheConstants VMObjectIndices VMSpurObjectRepresentationConstants VMSqueakClassIndices VMSqueakV3BytecodeConstants VMSqueakV3ObjectRepresentationConstants VMStackFrameOffsets' category: 'VMMaker-Interpreter'! !StackInterpreter commentStamp: 'eem 9/11/2013 18:30' prior: 0! This class is a complete implementation of the Smalltalk-80 virtual machine, derived originally from the Blue Book specification but quite different in some areas. This VM supports Closures but *not* old-style BlockContexts. It has been modernized with 32-bit pointers, better management of Contexts (see next item), and attention to variable use that allows the CCodeGenerator (qv) to keep, eg, the instruction pointer and stack pointer in registers as well as keeping most simple variables in a global array that seems to improve performance for most platforms. The VM does not use Contexts directly. Instead Contexts serve as proxies for a more conventional stack format that is invisible to the image. There is considerable explanation at http://www.mirandabanda.org/cogblog/2009/01/14/under-cover-contexts-and-the…. The VM maintains a fixed-size stack zone divided into pages, each page being capable of holding several method/block activations. A send establishes a new frame in the current stack page, a return returns to the previous frame. This eliminates allocation/deallocation of contexts and the moving of receiver and arguments from caller to callee on each send/return. Contexts are created lazily when an activation needs a context (creating a block, explicit use of thisContext, access to sender when sender is a frame, or linking of stack pages together). Contexts are either conventional and heap-resident ("single") or "married" and serve as proxies for their corresponding frame or "widowed", meaning that their spouse frame has been returned from (died). A married context is specially marked (more details in the code) and refers to its frame. Likewise a married frame is specially marked and refers to its context. In addition to SmallInteger arithmetic and Floats, the VM supports logic on 32-bit PositiveLargeIntegers, thus allowing it to simulate itself much more effectively than would otherwise be the case. NOTE: Here follows a list of things to be borne in mind when working on this code, or when making changes for the future. 1. There are a number of things that should be done the next time we plan to release a completely incompatible image format. These include unifying the instanceSize field of the class format word -- see instantiateClass:indexableSize:, and unifying the bits of the method primitive index (if we decide we need more than 512, after all) -- see primitiveIndexOf:. Also, contexts should be given a special format code (see next item). 2. There are several fast checks for contexts (see isContextHeader: and isMethodContextHeader:) which will fail if the compact class indices of BlockContext or MethodContext change. This is necessary because the oops may change during a compaction when the oops are being adjusted. It's important to be aware of this when writing a new image using the SystemTracer. A better solution would be to reserve one of the format codes for Contexts only. An even better solution is to eliminate compact classes altogether (see 6.). 3. We have made normal files tolerant to size and positions up to 32 bits. This has not been done for async files, since they are still experimental. The code in size, at: and at:put: should work with sizes and indices up to 31 bits, although I have not tested it (di 12/98); it might or might not work with 32-bit sizes. [Late news, the support has been extended to 64-bit file sizes]. 4. Note that 0 is used in a couple of places as an impossible oop. This should be changed to a constant that really is impossible (or perhaps there is code somewhere that guarantees it --if so it should be put in this comment). The places include the method cache and the at cache. 5. Moving to a 2 bit immediate tag and having immediate Characters is a good choice for Unicode and the JIT. We can still have 31-bit SmallIntegers by allowing two tag patterns for SmallInteger. 6. If Eliot Miranda's 2 word header scheme is acceptable in terms of footprint (we estimate about a 10% increase in image size with about 35 reclaimed by better representation of CompiledMethod - loss of MethodProperties) then the in-line cache for the JIT is simplified, class access is faster and header access is the same in 32-bit and full 64-bit images. [Late breaking news, the 2-word header scheme is more compact, by over 2%]. See SpurMemorymanager's class comment.! Item was changed: ----- Method: StackInterpreter class>>initializeMethodIndices (in category 'initialization') ----- initializeMethodIndices + | tagBits | "Class CompiledMethod" HeaderIndex := 0. LiteralStart := 1. + tagBits := self objectMemoryClass numSmallIntegerTagBits. + LargeContextBit := 16r20000 << tagBits. "This bit set in method headers if large context is needed." + MethodHeaderTempCountShift := 18 + tagBits. + MethodHeaderArgCountShift := 24 + tagBits. - LargeContextBit := 16r40000. "This bit set in method headers if large context is needed." "The position of the unused flag bit in the method header, not including tag bit(s)" HeaderFlagBitPosition := 29! Item was changed: ----- Method: StackInterpreter>>argumentCountOfMethodHeader: (in category 'compiled methods') ----- argumentCountOfMethodHeader: header <api> + ^header >> MethodHeaderArgCountShift bitAnd: 16rF! - ^header >> 25 bitAnd: 16r0F! Item was changed: ----- Method: StackInterpreter>>initialPCForHeader:method: (in category 'compiled methods') ----- initialPCForHeader: methodHeader method: theMethod + "Answer a pointer to the initial byte for a method; used only in methods that build a frame." - "Answer the initial PC for a method; used only in methods that build a frame." <inline: true> ^theMethod + ((LiteralStart + (objectMemory literalCountOfMethodHeader: methodHeader)) * objectMemory bytesPerOop) + objectMemory baseHeaderSize! Item was changed: ----- Method: StackInterpreter>>internalActivateNewMethod (in category 'message sending') ----- internalActivateNewMethod | methodHeader numTemps rcvr errorCode | <inline: true> methodHeader := objectMemory methodHeaderOf: newMethod. numTemps := self temporaryCountOfMethodHeader: methodHeader. + self assert: argumentCount = (self argumentCountOfMethodHeader: methodHeader). - rcvr := self internalStackValue: argumentCount. "could new rcvr be set at point of send?" self assert: (objectMemory isOopForwarded: rcvr) not. self internalPush: localIP. self internalPush: localFP. localFP := localSP. self internalPush: newMethod. self setMethod: newMethod methodHeader: methodHeader. self internalPush: (self encodeFrameFieldHasContext: false isBlock: false numArgs: (self argumentCountOfMethodHeader: methodHeader)). self internalPush: objectMemory nilObject. "FxThisContext field" self internalPush: rcvr. "Initialize temps..." argumentCount + 1 to: numTemps do: [:i | self internalPush: objectMemory nilObject]. "-1 to account for pre-increment in fetchNextBytecode" localIP := self pointerForOop: (self initialPCForHeader: methodHeader method: newMethod) - 1. (self methodHeaderHasPrimitive: methodHeader) ifTrue: ["Skip the CallPrimitive bytecode, if it's there, and store the error code if the method starts with a long store temp. Strictly no need to skip the store because it's effectively a noop." localIP := localIP + (self sizeOfCallPrimitiveBytecode: methodHeader). primFailCode ~= 0 ifTrue: [(objectMemory byteAt: localIP + 1) = (self longStoreBytecodeForHeader: methodHeader) ifTrue: [errorCode := self getErrorObjectFromPrimFailCode. self internalStackTopPut: errorCode "nil if primFailCode == 1, or primFailCode"]. primFailCode := 0]]. self assert: (self frameNumArgs: localFP) == argumentCount. self assert: (self frameIsBlockActivation: localFP) not. self assert: (self frameHasContext: localFP) not. "Now check for stack overflow or an event (interrupt, must scavenge, etc)." localSP < stackLimit ifTrue: [self externalizeIPandSP. self handleStackOverflowOrEventAllowContextSwitch: (self canContextSwitchIfActivating: newMethod header: methodHeader). self internalizeIPandSP]! Item was changed: ----- Method: StackInterpreter>>temporaryCountOfMethodHeader: (in category 'compiled methods') ----- temporaryCountOfMethodHeader: header <api> <inline: true> + ^header >> MethodHeaderTempCountShift bitAnd: 16r3F! - ^(header >> 19) bitAnd: 16r3F! Item was changed: ----- Method: StackInterpreterSimulatorLSB>>charsOfLong: (in category 'debug support') ----- charsOfLong: long + ^ (1 to: objectMemory wordSize) collect: - ^ (1 to: 4) collect: [:i | ((long digitAt: i) between: 14 and: 126) ifTrue: [(long digitAt: i) asCharacter] ifFalse: [$?]]!

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
17
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 November 2014