Vm-dev June 2017

vm-dev@lists.squeakfoundation.org

32 participants
76 discussions

VM Maker: VMMaker.oscog-eem.2241.mcz
by commits＠source.squeak.org 10 Jun '17

10 Jun '17

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.2241.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.2241 Author: eem Time: 9 June 2017, 10:52:32.120938 pm UUID: 774617ec-a18f-4da7-be97-d6e26ddc5ff3 Ancestors: VMMaker.oscog-eem.2240 Spur: Fix sign extension bug with new allocated bytes count. =============== Diff against VMMaker.oscog-eem.2240 =============== Item was changed: ----- Method: SpurMemoryManager class>>declareCVarsIn: (in category 'translation') ----- declareCVarsIn: aCCodeGenerator self declareCAsOop: #( memory freeStart scavengeThreshold newSpaceStart newSpaceLimit pastSpaceStart lowSpaceThreshold freeOldSpaceStart oldSpaceStart endOfMemory firstFreeChunk lastFreeChunk) in: aCCodeGenerator. self declareCAsUSqLong: (self allInstVarNames select: [:ivn| ivn endsWith: 'Usecs']), #(statAllocatedBytes) in: aCCodeGenerator. aCCodeGenerator var: #freeListsMask type: #usqInt; var: #freeLists type: #'sqInt *'; var: #objStackInvalidBecause type: #'char *'; var: #unscannedEphemerons type: #SpurContiguousObjStack; var: #heapGrowthToSizeGCRatio type: #float; var: #heapSizeAtPreviousGC type: #usqInt; var: #totalFreeOldSpace type: #usqInt; + var: #maxOldSpaceSize type: #usqInt. - var: #maxOldSpaceSize type: #usqInt; - var: #oldSpaceUsePriorToScavenge type: #usqInt. aCCodeGenerator + var: #oldSpaceUsePriorToScavenge type: #sqLong. + aCCodeGenerator var: #remapBuffer declareC: 'sqInt remapBuffer[RemapBufferSize + 1 /* ', (RemapBufferSize + 1) printString, ' */]'. aCCodeGenerator var: #extraRoots declareC: 'sqInt *extraRoots[ExtraRootsSize + 1 /* ', (ExtraRootsSize + 1) printString, ' */]'!

1 0

[OpenSmalltalk/opensmalltalk-vm] 5ec678: CogVM source as per VMMaker.oscog-eem.2240
by GitHub 10 Jun '17

10 Jun '17

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 5ec678cdc4c1c2a66ef81b47762b7338d8ee81d1 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/5ec678cdc4c1c2a66e… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2017-06-09 (Fri, 09 Jun 2017) Changed paths: M spurlowcode64src/vm/cogit.h M spurlowcode64src/vm/cogitX64SysV.c M spurlowcode64src/vm/cogitX64WIN64.c M spurlowcode64src/vm/cointerp.c M spurlowcode64src/vm/cointerp.h M spurlowcode64src/vm/gcc3x-cointerp.c M spurlowcodesrc/vm/cogit.h M spurlowcodesrc/vm/cogitARMv5.c M spurlowcodesrc/vm/cogitIA32.c M spurlowcodesrc/vm/cogitMIPSEL.c M spurlowcodesrc/vm/cointerp.c M spurlowcodesrc/vm/cointerp.h M spurlowcodesrc/vm/gcc3x-cointerp.c M spurlowcodestack64src/vm/gcc3x-interp.c M spurlowcodestack64src/vm/interp.c M spurlowcodestacksrc/vm/gcc3x-interp.c M spurlowcodestacksrc/vm/interp.c M spursista64src/vm/cogit.h M spursista64src/vm/cogitX64SysV.c M spursista64src/vm/cogitX64WIN64.c M spursista64src/vm/cointerp.c M spursista64src/vm/cointerp.h M spursista64src/vm/gcc3x-cointerp.c M spursistasrc/vm/cogit.h M spursistasrc/vm/cogitARMv5.c M spursistasrc/vm/cogitIA32.c M spursistasrc/vm/cogitMIPSEL.c M spursistasrc/vm/cointerp.c M spursistasrc/vm/cointerp.h M spursistasrc/vm/gcc3x-cointerp.c Log Message: ----------- CogVM source as per VMMaker.oscog-eem.2240 SistaCogit: Fix (I think) genGetInstanceOfFixedClass:into:initializingIf: for duff's device instance creation, and restore its use in genUnaryInlinePrimitive:. Fixed a regression where primitiveCollectCogCodeConstituents would not extract the details of CogMethods anymore if the first parameter is true. Simulator: Fix a bad bug with the simulation of the remembered set in 64-bits; the type for rememberedSet was ending up as int *. It must be int * on 32-bits but long long * on 64-bits.

1 0

VM Maker: VMMaker.oscog-eem.2240.mcz
by commits＠source.squeak.org 10 Jun '17

10 Jun '17

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.2240.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.2240 Author: eem Time: 9 June 2017, 8:10:37.386604 pm UUID: b7a78631-1fbc-42e2-a0e2-0a950a5db06e Ancestors: VMMaker.oscog-eem.2239 Fix (I think) genGetInstanceOfFixedClass:into:initializingIf: for duff's device instance creation, and restore its use in genUnaryInlinePrimitive:. Clément, I think I got it right. I tested the generated code worked correctly for the 11 slot case and then did in-image compilation for a set of classes with slot sizes 9 thorugh 32 and the code looks good. I hope you don't mind. =============== Diff against VMMaker.oscog-eem.2239 =============== Item was changed: + ----- Method: CogObjectRepresentationForSpur>>genGetInstanceOf:into:initializingIf: (in category 'inline primitive support') ----- - ----- Method: CogObjectRepresentationForSpur>>genGetInstanceOf:into:initializingIf: (in category 'bytecode generator support') ----- genGetInstanceOf: classObj into: destReg initializingIf: initializeInstance "Create an instance of classObj and assign it to destReg, initializing the instance if initializeInstance is true with nil or 0 as appropriate This is for inline primitives. Assume there is sufficient space in new space to complete the operation. Answer zero on success." | classIndex classFormat header slots | ((objectMemory isNonImmediate: classObj) and: [(coInterpreter objCouldBeClassObj: classObj) and: [(classIndex := objectMemory rawHashBitsOf: classObj) ~= 0 and: [(objectMemory isFixedSizePointerFormat: (objectMemory instSpecOfClassFormat: (classFormat := objectMemory formatOfClass: classObj))) and: [(slots := objectMemory fixedFieldsOfClassFormat: classFormat) < objectMemory numSlotsMask]]]]) ifFalse: [^UnimplementedOperation]. self deny: destReg = TempReg. header := objectMemory headerForSlots: slots format: (objectMemory instSpecOfClassFormat: classFormat) classIndex: classIndex. cogit MoveAw: objectMemory freeStartAddress R: destReg. self genStoreHeader: header intoNewInstance: destReg using: TempReg. cogit LoadEffectiveAddressMw: (objectMemory smallObjectBytesForSlots: slots) r: destReg R: TempReg; MoveR: TempReg Aw: objectMemory freeStartAddress. (initializeInstance and: [slots > 0]) ifTrue: [cogit genMoveConstant: objectMemory nilObject R: TempReg. 0 to: slots - 1 do: [:i| cogit MoveR: TempReg Mw: i * objectMemory wordSize + objectMemory baseHeaderSize r: destReg]]. ^0! Item was changed: + ----- Method: CogObjectRepresentationForSpur>>genGetInstanceOfFixedClass:into:initializingIf: (in category 'inline primitive support') ----- - ----- Method: CogObjectRepresentationForSpur>>genGetInstanceOfFixedClass:into:initializingIf: (in category 'bytecode generator support') ----- genGetInstanceOfFixedClass: classObj into: destReg initializingIf: initializeInstance "Create an instance of classObj and assign it to destReg, initializing the instance if initializeInstance is true with nil or 0 as appropriate This is for inline primitives. Assume there is sufficient space in new space to complete the operation. Answer zero on success." | classIndex classFormat header slots branch constReg inst loop delta loopCount slotsPerIteration | ((objectMemory isNonImmediate: classObj) and: [(coInterpreter objCouldBeClassObj: classObj) and: [(classIndex := objectMemory rawHashBitsOf: classObj) ~= 0 and: [(objectMemory isFixedSizePointerFormat: (objectMemory instSpecOfClassFormat: (classFormat := objectMemory formatOfClass: classObj))) and: [(slots := objectMemory fixedFieldsOfClassFormat: classFormat) < objectMemory numSlotsMask]]]]) ifFalse: [^UnimplementedOperation]. header := objectMemory headerForSlots: slots format: (objectMemory instSpecOfClassFormat: classFormat) classIndex: classIndex. cogit MoveAw: objectMemory freeStartAddress R: destReg. self genStoreHeader: header intoNewInstance: destReg using: TempReg. cogit LoadEffectiveAddressMw: (objectMemory smallObjectBytesForSlots: slots) r: destReg R: TempReg; MoveR: TempReg Aw: objectMemory freeStartAddress. (initializeInstance and: [slots > 0]) ifFalse: [^0]. + slots <= (slotsPerIteration := 8) ifTrue: "slotsPerIteration must be even; see cogit SubCq: objectMemory bytesPerOop R: TempReg below" - slots <= (slotsPerIteration := 8) ifTrue: "slotsPerIteration must be a power of two. see bitAnd: below" [cogit genMoveConstant: objectMemory nilObject R: TempReg. 0 to: slots - 1 do: [:i| cogit MoveR: TempReg Mw: i * objectMemory wordSize + objectMemory baseHeaderSize r: destReg]. ^0]. + "self halt: 'genGetInstanceOfFixedClass:... ', slots asInteger." constReg := cogit allocateRegNotConflictingWith: destReg. cogit genMoveConstant: objectMemory nilObject R: constReg. slots \\ slotsPerIteration ~= 0 + ifTrue: "delta maps the offset at the loop entryPoint onto destReg + objectMemory baseHeaderSize" + [delta := (slotsPerIteration - (slots \\ slotsPerIteration) * objectMemory bytesPerOop) - objectMemory baseHeaderSize. + delta > 0 ifTrue: [cogit SubCq: delta R: destReg]. + delta < 0 ifTrue: [cogit AddCq: delta negated R: destReg]. + "now delta maps (loopCount * slotsPerIteration * objectMemory bytesPerOop) + objectMemory baseHeaderSize - delta to the start of the object" + delta := delta + objectMemory baseHeaderSize. + (objectMemory bytesPerOop < objectMemory baseHeaderSize + and: [slots \\ 2 = 1]) ifTrue: "if end of loop is not at start of next object, adjust loop limit in TempReg to point to last field filled." + [cogit SubCq: objectMemory bytesPerOop R: TempReg]. - ifTrue: - [delta := objectMemory baseHeaderSize - ((slotsPerIteration - (slots \\ slotsPerIteration) bitAnd: slotsPerIteration - 1) * objectMemory bytesPerOop). - delta ~= 0 ifTrue: - [cogit AddCq: delta R: destReg]. branch := cogit Jump: 0] ifFalse: + [delta := 0. - [delta := objectMemory baseHeaderSize. cogit AddCq: objectMemory baseHeaderSize R: destReg]. + "loopCount is number of times through the increment of destReg." loopCount := slots + slotsPerIteration - 1 // slotsPerIteration. self assert: loopCount > 1. loop := cogit Label. 0 to: 7 do: [:i| inst := cogit MoveR: constReg Mw: i * objectMemory bytesPerOop r: destReg. slotsPerIteration - (slots \\ slotsPerIteration) = i ifTrue: [branch jmpTarget: inst]]. - "N.B. We get away with comparing against TempReg, which points to the start of the next - object, not necessarily immediately after the last slot, because if the size is a multiple of 8, - TempReg will point after the last slot, and if the size is not a multiple of 8 then the add of - slotsPerIteration * objectMemory bytesPerOop will put destReg beyond TempReg any way." cogit AddCq: slotsPerIteration * objectMemory bytesPerOop R: destReg; CmpR: TempReg R: destReg; JumpBelow: loop; + SubCq: (loopCount * slotsPerIteration * objectMemory bytesPerOop) + objectMemory baseHeaderSize - delta R: destReg. - SubCq: delta + (loopCount * slotsPerIteration * objectMemory bytesPerOop) R: destReg. ^0! Item was changed: + ----- Method: CogObjectRepresentationForSpur>>genSetGCNeeded (in category 'inline primitive support') ----- - ----- Method: CogObjectRepresentationForSpur>>genSetGCNeeded (in category 'bytecode generator support') ----- genSetGCNeeded <inline: true> cogit MoveCq: 1 R: TempReg; MoveR: TempReg Aw: coInterpreter needGCFlagAddress! Item was changed: ----- Method: SistaCogit>>genUnaryInlinePrimitive: (in category 'inline primitive generators') ----- genUnaryInlinePrimitive: prim "Unary inline primitives." "SistaV1: 248 11111000 iiiiiiii mjjjjjjj Call Primitive #iiiiiiii + (jjjjjjj * 256) m=1 means inlined primitive, no hard return after execution. See EncoderForSistaV1's class comment and StackInterpreter>>#unaryInlinePrimitive:" | rcvrReg resultReg | rcvrReg := self allocateRegForStackEntryAt: 0. resultReg := self allocateRegNotConflictingWith: (self registerMaskFor: rcvrReg). prim caseOf: { "00 unchecked class" [1] -> "01 unchecked pointer numSlots" [self ssTop popToReg: rcvrReg. self ssPop: 1. objectRepresentation genGetNumSlotsOf: rcvrReg into: resultReg; genConvertIntegerToSmallIntegerInReg: resultReg]. "02 unchecked pointer basicSize" [3] -> "03 unchecked byte numBytes" [self ssTop popToReg: rcvrReg. self ssPop: 1. objectRepresentation genGetNumBytesOf: rcvrReg into: resultReg; genConvertIntegerToSmallIntegerInReg: resultReg]. "04 unchecked short16Type format numShorts" "05 unchecked word32Type format numWords" "06 unchecked doubleWord64Type format numDoubleWords" [11] -> "11 unchecked fixed pointer basicNew" [self ssTop type ~= SSConstant ifTrue: [^EncounteredUnknownBytecode]. (objectRepresentation + genGetInstanceOfFixedClass: self ssTop constant - genGetInstanceOf: self ssTop constant into: resultReg + initializingIf: self extBSpecifiesInitializeInstance) ~= 0 ifTrue: - initializingIf: self extBSpecifiesInitializeInstance) ~= 0 ifTrue: [^ShouldNotJIT]. "e.g. bad class" self ssPop: 1] . [20] -> "20 identityHash" [objectRepresentation genGetIdentityHash: rcvrReg resultReg: resultReg. self ssPop: 1] . "21 identityHash (SmallInteger)" "22 identityHash (Character)" "23 identityHash (SmallFloat64)" "24 identityHash (Behavior)" "30 immediateAsInteger (Character) 31 immediateAsInteger (SmallFloat64) 35 immediateAsFloat (SmallInteger) " [30] -> [self ssTop popToReg: resultReg. objectRepresentation genConvertCharacterToSmallIntegerInReg: resultReg. self ssPop: 1]. [35] -> [self assert: self processorHasDoublePrecisionFloatingPointSupport. self MoveR: rcvrReg R: TempReg. self genConvertSmallIntegerToIntegerInReg: TempReg. self ConvertR: TempReg Rd: DPFPReg0. self flag: #TODO. "Should never fail" self genAllocFloatValue: DPFPReg0 into: resultReg scratchReg: TempReg scratchReg: NoReg. "scratch2 for V3 only"] } otherwise: [^EncounteredUnknownBytecode]. extB := 0. numExtB := 0. self ssPushRegister: resultReg. ^0!

2 1

VM Maker: VMMaker.oscog-eem.2239.mcz
by commits＠source.squeak.org 10 Jun '17

10 Jun '17

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.2239.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.2239 Author: eem Time: 9 June 2017, 3:27:37.066085 pm UUID: 1ce7aaee-c3f3-4e1e-b79b-18b2b0557940 Ancestors: VMMaker.oscog-cb.2238 Simulator: Fix a bad bug with the simulation of the remembered set in 64-bits; they type for rememberedSet was ending up as int *. It must be int * on 32-bits but long long * on 64-bits. Add indexInRememberedSet: and an accessor for rememberedSet. Fix some spelling errors. =============== Diff against VMMaker.oscog-cb.2238 =============== Item was changed: ----- Method: CArray>>coerceTo:sim: (in category 'converting') ----- coerceTo: cTypeString sim: interpreterSimulator ^cTypeString caseOf: { ['int'] -> [self ptrAddress]. ['float *'] -> [self asSingleFloatAccessor]. ['double *'] -> [self asDoubleFloatAccessor]. + ['sqInt *'] -> [self shallowCopy unitSize: interpreter bytesPerOop; yourself]. ['unsigned int *'] -> [self shallowCopy unitSize: 4; yourself]. ['int *'] -> [self shallowCopy unitSize: 4; yourself]. ['char *'] -> [self shallowCopy unitSize: 1; yourself]. ['unsigned char *'] -> [self shallowCopy unitSize: 1; yourself]. + ['unsigned'] -> [self ptrAddress]. - ['unsigned'] -> [self ptrAddress]. ['sqInt'] -> [self ptrAddress]. ['usqInt'] -> [self ptrAddress] }! Item was changed: ----- Method: Integer>>coerceTo:sim: (in category '*VMMaker-interpreter simulator') ----- coerceTo: cTypeString sim: interpreter | unitSize | cTypeString last = $* ifTrue: "C pointer" [unitSize := cTypeString caseOf: { ['char *'] -> [1]. ['short *'] -> [2]. ['int *'] -> [4]. + ['long long *'] -> [8]. ['float *'] -> [^CFloatArray basicNew interpreter: interpreter address: self unitSize: 4; yourself]. ['double *'] -> [^CFloatArray basicNew interpreter: interpreter address: self unitSize: 8; yourself]. ['unsigned *'] -> [4]. ['unsigned int *'] -> [4]. ['unsigned char *'] -> [1]. ['signed char *'] -> [1]. ['unsigned short *'] -> [2]. + ['unsigned long long *'] -> [8]. ['oop *'] -> [interpreter bytesPerOop]. } otherwise: [interpreter wordSize]. ^CArray basicNew interpreter: interpreter address: self unitSize: unitSize; yourself]. ^self "C number (int, char, float, etc)"! Item was added: + ----- Method: SpurGenerationScavenger>>indexInRememberedSet: (in category 'store check') ----- + indexInRememberedSet: objOop + <doNotGenerate> + 0 to: rememberedSetSize - 1 do: + [:i| + (rememberedSet at: i) = objOop ifTrue: + [^i]]. + ^nil! Item was changed: ----- Method: SpurGenerationScavenger>>initializeRememberedSet (in category 'initialization') ----- initializeRememberedSet | obj | obj := manager rememberedSetObj. + obj = manager nilObject + ifTrue: + [obj := manager allocatePinnedSlots: 1024. + manager rememberedSetObj: obj] + ifFalse: "The Spur32to64BitBootstrap failed to set the type of rememberedSetObj to 64-bit indexability. + This is unimportant except for simulation; rememberedSet is declared as sqInt *, but in to have + firstIndexableField: below answer a suitable type the format must be wordIndexableFormat." + [manager setFormatOf: obj to: manager wordIndexableFormat]. + self assert: (manager formatOf: obj) = manager wordIndexableFormat. + self assert: (manager isPinned: obj). - obj = manager nilObject ifTrue: - [obj := manager allocatePinnedSlots: 1024. - manager rememberedSetObj: obj]. rememberedSet := manager firstIndexableField: obj. rememberedSetSize := 0. rememberedSetLimit := manager numSlotsOf: obj. self setRememberedSetRedZone! Item was changed: ----- Method: SpurGenerationScavenger>>relocateRememberedSet (in category 'remembered set') ----- relocateRememberedSet + "For SpurPlanningCompactor" - "For SpurPanningCompactor" rememberedSet := manager firstIndexableField: manager rememberedSetObj! Item was added: + ----- Method: SpurGenerationScavengerSimulator>>rememberedSet (in category 'accessing') ----- + rememberedSet + ^rememberedSet! Item was changed: ----- Method: SpurMemoryManager>>relocateObjStackForPlanningCompactor: (in category 'compaction') ----- relocateObjStackForPlanningCompactor: objStack + "Relocate all objStack pages that comprise objStack." - "Relocate all objStack pages that cmprise objStack." | stackOrNil freeList next relocated result | objStack = nilObj ifTrue: [^objStack]. stackOrNil := objStack. freeList := self fetchPointer: ObjStackFreex ofObject: objStack. [self assert: (self numSlotsOfAny: stackOrNil) = ObjStackPageSlots. "There are four fixed slots in an obj stack, and a Topx of 0 indicates empty, so if there were 5 slots in an oop stack, full would be 2, and the last 0-rel index is 4. Hence the last index is topx + fixed slots - 1, or topx + ObjStackNextx" next := self fetchPointer: ObjStackNextx ofObject: stackOrNil. relocated := compactor relocateObjectsInHeapEntity: stackOrNil from: ObjStackFreex to: ObjStackNextx + (self rawHashBitsOf: stackOrNil). stackOrNil = objStack ifTrue: [result := relocated]. self setHashBitsOf: stackOrNil to: 0. next ~= 0] whileTrue: [stackOrNil := next]. [freeList ~= 0] whileTrue: [self assert: (self numSlotsOfAny: freeList) = ObjStackPageSlots. next := self fetchPointer: ObjStackFreex ofObject: freeList. compactor relocateObjectsInHeapEntity: freeList from: ObjStackFreex to: ObjStackFreex. freeList := next]. ^relocated! Item was changed: ----- Method: SpurPlanningCompactor>>updatePointersInManagerHeapEntities (in category 'compaction') ----- updatePointersInManagerHeapEntities "The special non-pointer objects containing pointers, which are the objStacks and the rememberedSet, + must be updated manually since they will not be recognized as containing pointers in the normal sweep." - must be updated manually sicme they will not be recognized as containing pointers in the normal sweep." manager relocateObjStacksForPlanningCompactor. (scavenger rememberedSetSize > 0 and: [self isMobile: firstFieldOfRememberedSet]) ifTrue: [firstFieldOfRememberedSet := manager fetchPointer: 0 ofObject: firstFieldOfRememberedSet]. self relocateObjectsInHeapEntity: manager rememberedSetObj from: 1 to: scavenger rememberedSetSize - 1 "Note that we /must not/ set the rememberedSetObj here since it is a slot in the hiddenRootsObj and will be updated normally in updatePointersInInitialImmobileObjects. So do not do (self isMobile: manager rememberedSetObj) ifTrue: [manager rememberedSetObj: (manager fetchPointer: 0 ofObject: manager rememberedSetObj)]"!

1 0

VM Maker: VMMaker.oscog-cb.2238.mcz
by commits＠source.squeak.org 09 Jun '17

09 Jun '17

ClementBera uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-cb.2238.mcz ==================== Summary ==================== Name: VMMaker.oscog-cb.2238 Author: cb Time: 9 June 2017, 9:05:13.698892 pm UUID: 51e6a4b3-de49-41ac-a793-87fe0abd5ba9 Ancestors: VMMaker.oscog-eem.2237 Fixed a regression where primitiveCollectCogCodeConstituents would not extract the details of CogMethods anymore if the first parameter is true. Reverted the implementation of inlined allocation to the pre-duff device to be able to run benchmarks using the travis-compiled VMs instead of hand-compiled VMs (Even with a reproducible case from image start-up since May 16th, neither I or Eliot have found enough time / have been able to fix it, so it clearly makes sense to keep it disabled for now).Working VMs allow Tim F. to keep benchmarks comparisons such as this one up-to-date: http://speed.squeak.org/comparison/?exe=11%2BL%2BCog%2C13%2BL%2BCog&ben=1%2… =============== Diff against VMMaker.oscog-eem.2237 =============== Item was changed: ----- Method: CoInterpreterPrimitives>>primitiveCollectCogCodeConstituents (in category 'process primitives') ----- primitiveCollectCogCodeConstituents "Answer the contents of the code zone as an array of pair-wise element, address in ascending address order. Answer a string for a runtime routine or abstract label (beginning, end, etc), a CompiledMethod for a CMMethod, or a selector (presumably a Symbol) for a PIC. If there is an argument and it is true, then collect inner information about the CogMethod." | constituents withDetails | argumentCount = 0 ifTrue: [withDetails := false] ifFalse: [withDetails := self stackTop. (withDetails = objectMemory trueObject or: [withDetails = objectMemory falseObject]) ifFalse: [^self primitiveFailFor: PrimErrBadArgument]. withDetails := withDetails = objectMemory trueObject]. + constituents := cogit cogCodeConstituents: withDetails. - constituents := cogit cogCodeConstituents: withDetails = objectMemory trueObject. constituents ifNil: [^self primitiveFailFor: PrimErrNoMemory]. self pop: argumentCount + 1 thenPush: constituents! Item was changed: ----- Method: SistaCogit>>genUnaryInlinePrimitive: (in category 'inline primitive generators') ----- genUnaryInlinePrimitive: prim "Unary inline primitives." "SistaV1: 248 11111000 iiiiiiii mjjjjjjj Call Primitive #iiiiiiii + (jjjjjjj * 256) m=1 means inlined primitive, no hard return after execution. See EncoderForSistaV1's class comment and StackInterpreter>>#unaryInlinePrimitive:" | rcvrReg resultReg | rcvrReg := self allocateRegForStackEntryAt: 0. resultReg := self allocateRegNotConflictingWith: (self registerMaskFor: rcvrReg). prim caseOf: { "00 unchecked class" [1] -> "01 unchecked pointer numSlots" [self ssTop popToReg: rcvrReg. self ssPop: 1. objectRepresentation genGetNumSlotsOf: rcvrReg into: resultReg; genConvertIntegerToSmallIntegerInReg: resultReg]. "02 unchecked pointer basicSize" [3] -> "03 unchecked byte numBytes" [self ssTop popToReg: rcvrReg. self ssPop: 1. objectRepresentation genGetNumBytesOf: rcvrReg into: resultReg; genConvertIntegerToSmallIntegerInReg: resultReg]. "04 unchecked short16Type format numShorts" "05 unchecked word32Type format numWords" "06 unchecked doubleWord64Type format numDoubleWords" [11] -> "11 unchecked fixed pointer basicNew" [self ssTop type ~= SSConstant ifTrue: [^EncounteredUnknownBytecode]. (objectRepresentation + genGetInstanceOf: self ssTop constant - genGetInstanceOfFixedClass: self ssTop constant into: resultReg + initializingIf: self extBSpecifiesInitializeInstance) ~= 0 ifTrue: - initializingIf: self extBSpecifiesInitializeInstance) ~= 0 ifTrue: [^ShouldNotJIT]. "e.g. bad class" self ssPop: 1] . [20] -> "20 identityHash" [objectRepresentation genGetIdentityHash: rcvrReg resultReg: resultReg. self ssPop: 1] . "21 identityHash (SmallInteger)" "22 identityHash (Character)" "23 identityHash (SmallFloat64)" "24 identityHash (Behavior)" "30 immediateAsInteger (Character) 31 immediateAsInteger (SmallFloat64) 35 immediateAsFloat (SmallInteger) " [30] -> [self ssTop popToReg: resultReg. objectRepresentation genConvertCharacterToSmallIntegerInReg: resultReg. self ssPop: 1]. [35] -> [self assert: self processorHasDoublePrecisionFloatingPointSupport. self MoveR: rcvrReg R: TempReg. self genConvertSmallIntegerToIntegerInReg: TempReg. self ConvertR: TempReg Rd: DPFPReg0. self flag: #TODO. "Should never fail" self genAllocFloatValue: DPFPReg0 into: resultReg scratchReg: TempReg scratchReg: NoReg. "scratch2 for V3 only"] } otherwise: [^EncounteredUnknownBytecode]. extB := 0. numExtB := 0. self ssPushRegister: resultReg. ^0!

1 0

[OpenSmalltalk/opensmalltalk-vm] 77dcd0: CogVM source as per VMMaker.oscog-eem.2237
by GitHub 08 Jun '17

08 Jun '17

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 77dcd09cdd6c8c889e91578b62f04201ebdc9999 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/77dcd09cdd6c8c889e… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2017-06-07 (Wed, 07 Jun 2017) Changed paths: M image/BuildSqueakSpurTrunkVMMakerImage.st M nsspur64src/vm/cogit.h M nsspur64src/vm/cogitX64SysV.c M nsspur64src/vm/cogitX64WIN64.c M nsspur64src/vm/cointerp.c M nsspur64src/vm/cointerp.h M nsspur64src/vm/gcc3x-cointerp.c M nsspursrc/vm/cogit.h M nsspursrc/vm/cogitARMv5.c M nsspursrc/vm/cogitIA32.c M nsspursrc/vm/cogitMIPSEL.c M nsspursrc/vm/cointerp.c M nsspursrc/vm/cointerp.h M nsspursrc/vm/gcc3x-cointerp.c M nsspurstack64src/vm/gcc3x-interp.c M nsspurstack64src/vm/interp.c M nsspurstacksrc/vm/gcc3x-interp.c M nsspurstacksrc/vm/interp.c M spur64src/vm/cogit.h M spur64src/vm/cogitX64SysV.c M spur64src/vm/cogitX64WIN64.c M spur64src/vm/cointerp.c M spur64src/vm/cointerp.h M spur64src/vm/gcc3x-cointerp.c M spurlowcode64src/vm/cogit.h M spurlowcode64src/vm/cogitX64SysV.c M spurlowcode64src/vm/cogitX64WIN64.c M spurlowcode64src/vm/cointerp.c M spurlowcode64src/vm/cointerp.h M spurlowcode64src/vm/gcc3x-cointerp.c M spurlowcodesrc/vm/cogit.h M spurlowcodesrc/vm/cogitARMv5.c M spurlowcodesrc/vm/cogitIA32.c M spurlowcodesrc/vm/cogitMIPSEL.c M spurlowcodesrc/vm/cointerp.c M spurlowcodesrc/vm/cointerp.h M spurlowcodesrc/vm/gcc3x-cointerp.c M spurlowcodestack64src/vm/gcc3x-interp.c M spurlowcodestack64src/vm/interp.c M spurlowcodestacksrc/vm/gcc3x-interp.c M spurlowcodestacksrc/vm/interp.c M spursista64src/vm/cogit.h M spursista64src/vm/cogitX64SysV.c M spursista64src/vm/cogitX64WIN64.c M spursista64src/vm/cointerp.c M spursista64src/vm/cointerp.h M spursista64src/vm/gcc3x-cointerp.c M spursistasrc/vm/cogit.h M spursistasrc/vm/cogitARMv5.c M spursistasrc/vm/cogitIA32.c M spursistasrc/vm/cogitMIPSEL.c M spursistasrc/vm/cointerp.c M spursistasrc/vm/cointerp.h M spursistasrc/vm/gcc3x-cointerp.c M spursrc/vm/cogit.h M spursrc/vm/cogitARMv5.c M spursrc/vm/cogitIA32.c M spursrc/vm/cogitMIPSEL.c M spursrc/vm/cointerp.c M spursrc/vm/cointerp.h M spursrc/vm/gcc3x-cointerp.c M spurstack64src/vm/gcc3x-interp.c M spurstack64src/vm/interp.c M spurstacksrc/vm/gcc3x-interp.c M spurstacksrc/vm/interp.c M src/vm/cogit.h M src/vm/cogitARMv5.c M src/vm/cogitIA32.c M src/vm/cogitMIPSEL.c M src/vm/cointerp.c M src/vm/cointerp.h M src/vm/cointerpmt.c M src/vm/cointerpmt.h M src/vm/gcc3x-cointerp.c M src/vm/gcc3x-cointerpmt.c M stacksrc/vm/gcc3x-interp.c M stacksrc/vm/interp.c Log Message: ----------- CogVM source as per VMMaker.oscog-eem.2237 Interpreter: Fix regression in VMMaker.oscog-eem.2222. If primitiveMakePoint no longer checks its receiver the inlined special selector form must. Add isFloatOrInt: to make checking simpler. Provide a breakLookupClassTag check on full lookup sends for debugging. Spur: Implement an allocated bytes tally accessible via vmParameterAt: 34 (which used to access statAllocationCount). Do this by counting bytes allocated in eden plus change in usage between scavenges. Hence maintain totalHeapSizeIncludingBridges in SpurSegmentManager. N.B. the parameter can be reset, e.g. to 0, via vmParameterAt: 34 put: 0, hence it can be used to measure allocation over a span of code. Fix a bug in calculating heapSizeAtPreviousGC which simply calculated the extentof oldSpace, potentially a huge overestimate, not its size. Add printOopsExcept: for debugging. Add printMarkedOops: and printUnmarkedOops: to get round an LLDB limitation with calling printOopsSuchThat:/Except: VMMaker build scripts: KlattResonatorIndices does need to be loaded. classnamed: => classNamed:

1 0

the purpose of CI
by Ben Coman 08 Jun '17

08 Jun '17

Maybe I'm speaking out of turn from the sidelines, but just curious to ask a leading question... What is the purpose of the Continuous Integration system? I notice Travis has not had a green build for nearly 120 days https://travis-ci.org/OpenSmalltalk/opensmalltalk-vm/builds since Build #603... https://travis-ci.org/OpenSmalltalk/opensmalltalk-vm/builds/200671152 I'd guess that makes it harder to identify which "new" commits introduce "new" defects. It was tough for me trying to categorise the historical failures to understand what might be required to make them green. For example, lately the usual failure has been just a single job... macos32x64 squeak.sista.spur. which last worked 22 days ago in Build #713 https://travis-ci.org/OpenSmalltalk/opensmalltalk-vm/builds/228902233 but there are other failures in builds that obscure that fact, way back to #603. Only an exhaustive search through all builds reveals this. For example, recent Build #748 has macos32x64 squeak.sista.spur as its only failure https://travis-ci.org/OpenSmalltalk/opensmalltalk-vm/builds/236010112 but then #750,#751, #752, #753 introduce other failures. Perhaps a contributing factor is commits being pushed directly to the server Cog branch, with CI tests only running after they are integrated. I guess that was done to keep the workflow similar for those moving from subversion to git. However it seems to lose some value of CI in "preventing" build failures from entering the repository. After a year of using git maybe this workflow could be reconsidered? Perhaps turn turn on branch protection for administrators and "force" all commits to the server Cog branch to first pass CI testing? Of course needing to submit everything via PRs adds workflow overhead, but some workflows might minimise the impact. So I can't argue whether the benefit is worth it, since I'm not working in the VM every day. I'm just bumping the status quo to table the question for discussion. cheers -ben P.S. Should macos32x64 squeak.sista.spur be fixed, or temporarily removed from the build matrix? A continually failing build seems to serve no purpose, whereas green builds should be a great help to noticing new failures.

9 23

VM Maker: VMMaker.oscog-eem.2237.mcz
by commits＠source.squeak.org 08 Jun '17

08 Jun '17

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.2237.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.2237 Author: eem Time: 7 June 2017, 3:10:26.925647 pm UUID: 478bccfa-1316-4b8a-b3a9-7f3fd01c3b71 Ancestors: VMMaker.oscog-eem.2236 Spur: Implement an allocated bytes tally accessible via vmParameterAt: 34 (which used to access statAllocationCount). Do this by counting bytes allocated in eden plus change in usage between scavenges. hence maintain totalHeapSizeIncludingBridges in SpurSegmentManager. Fix a bug in calculating heapSizeAtPreviousGC which simply calculated the extent of oldSpace, potentially a huge overestimate, not its size. Interpreter: Provide a breakLookupClassTag check on full lookup sends for debugging. =============== Diff against VMMaker.oscog-eem.2236 =============== Item was changed: ----- Method: CoInterpreter>>lookupLexicalNoMNU:from:rule: (in category 'message sending') ----- lookupLexicalNoMNU: selector from: mixin rule: rule "A shared part of the lookup for implicit receiver sends that found a lexically visible method, and self and outer sends." | receiverClass mixinApplication dictionary found | receiverClass := objectMemory fetchClassOf: localAbsentReceiver. lkupClass := receiverClass. "MNU lookup starts here." + self lookupBreakFor: lkupClass. mixinApplication := self findApplicationOfTargetMixin: mixin startingAtBehavior: receiverClass. dictionary := objectMemory followObjField: MethodDictionaryIndex ofObject: mixinApplication. found := self lookupMethodInDictionary: dictionary. (found and: [(self isPrivateMethod: newMethod)]) ifTrue: [^0]. ^self lookupProtectedNoMNU: selector startingAt: receiverClass rule: rule! Item was changed: ----- Method: CoInterpreter>>lookupProtectedNoMNU:startingAt:rule: (in category 'message sending') ----- lookupProtectedNoMNU: selector startingAt: mixinApplication rule: rule "A shared part of the lookup for self, outer or implicit receiver sends that did not find a private lexically visible method, and (Newspeak) super sends." | currentClass dictionary found | + self lookupBreakFor: mixinApplication. currentClass := mixinApplication. [currentClass = objectMemory nilObject] whileFalse: [dictionary := objectMemory followObjField: MethodDictionaryIndex ofObject: currentClass. found := self lookupMethodInDictionary: dictionary. (found and: [(self isPrivateMethod: newMethod) not]) ifTrue: [^0]. currentClass := self superclassOf: currentClass]. ^SelectorDoesNotUnderstand! Item was added: + ----- Method: CogVMSimulator>>primitiveVMParameter (in category 'system control primitives') ----- + primitiveVMParameter + (argumentCount = 2 + and: [(self stackValue: 1) = (objectMemory integerObjectOf: 34)]) ifTrue: + [self halt]. + ^super primitiveVMParameter! Item was added: + ----- Method: ObjectMemory>>shouldBreakForLookupIn:given: (in category 'debug support') ----- + shouldBreakForLookupIn: lookupClass given: breakClassTag + <inline: true> + ^lookupClass == breakClassTag! Item was changed: ----- Method: Spur32BitMemoryManager>>methodDictionaryHash:mask: (in category 'interpreter access') ----- methodDictionaryHash: oop mask: mask <inline: true> ^mask bitAnd: ((self isImmediate: oop) ifTrue: [(self isIntegerObject: oop) ifTrue: [self integerValueOf: oop] ifFalse: [self characterValueOf: oop]] + ifFalse: [self rawHashBitsOf: oop]) "If no hash then it isn't in the dictionary..."! - ifFalse: [self hashBitsOf: oop])! Item was changed: ----- Method: Spur64BitMemoryManager>>methodDictionaryHash:mask: (in category 'interpreter access') ----- methodDictionaryHash: oop mask: mask <inline: true> ^mask bitAnd: ((self isImmediate: oop) + ifTrue: [self integerValueOf: oop] "this will fail for SmallFloat64 but we don't care" + ifFalse: [self rawHashBitsOf: oop]) "If no hash then it isn't in the dictionary..."! - ifTrue: [self integerValueOf: oop] "this will fail for ShortFloat but we don't care" - ifFalse: [self hashBitsOf: oop])! Item was changed: CogClass subclass: #SpurMemoryManager (excessive size, no diff calculated) Item was changed: ----- Method: SpurMemoryManager class>>declareCVarsIn: (in category 'translation') ----- declareCVarsIn: aCCodeGenerator self declareCAsOop: #( memory freeStart scavengeThreshold newSpaceStart newSpaceLimit pastSpaceStart lowSpaceThreshold freeOldSpaceStart oldSpaceStart endOfMemory firstFreeChunk lastFreeChunk) in: aCCodeGenerator. + self declareCAsUSqLong: (self allInstVarNames select: [:ivn| ivn endsWith: 'Usecs']), #(statAllocatedBytes) - self declareCAsUSqLong: (self allInstVarNames select: [:ivn| ivn endsWith: 'Usecs']) in: aCCodeGenerator. aCCodeGenerator var: #freeListsMask type: #usqInt; var: #freeLists type: #'sqInt *'; var: #objStackInvalidBecause type: #'char *'; var: #unscannedEphemerons type: #SpurContiguousObjStack; var: #heapGrowthToSizeGCRatio type: #float; var: #heapSizeAtPreviousGC type: #usqInt; var: #totalFreeOldSpace type: #usqInt; + var: #maxOldSpaceSize type: #usqInt; + var: #oldSpaceUsePriorToScavenge type: #usqInt. - var: #maxOldSpaceSize type: #usqInt. aCCodeGenerator var: #remapBuffer declareC: 'sqInt remapBuffer[RemapBufferSize + 1 /* ', (RemapBufferSize + 1) printString, ' */]'. aCCodeGenerator var: #extraRoots declareC: 'sqInt *extraRoots[ExtraRootsSize + 1 /* ', (ExtraRootsSize + 1) printString, ' */]'! Item was added: + ----- Method: SpurMemoryManager>>currentAllocatedBytes (in category 'allocation accounting') ----- + currentAllocatedBytes + "Compute the current allocated bytes since last set. + This is the cumulative total in statAllocatedBytes plus the allocation since the last scavenge." + | use | + use := segmentManager totalOldSpaceCapacity - totalFreeOldSpace. + ^statAllocatedBytes + + (freeStart - scavenger eden start) + + (use - oldSpaceUsePriorToScavenge)! Item was added: + ----- Method: SpurMemoryManager>>doAllocationAccountingForScavenge (in category 'allocation accounting') ----- + doAllocationAccountingForScavenge + <inline: true> + statAllocatedBytes := self currentAllocatedBytes! Item was changed: ----- Method: SpurMemoryManager>>doScavenge: (in category 'gc - scavenging') ----- doScavenge: tenuringCriterion "The inner shell for scavenge, abstrascted out so globalGarbageCollect can use it." <inline: false> + self doAllocationAccountingForScavenge. gcPhaseInProgress := ScavengeInProgress. pastSpaceStart := scavenger scavenge: tenuringCriterion. self assert: (self oop: pastSpaceStart isGreaterThanOrEqualTo: scavenger pastSpace start andLessThanOrEqualTo: scavenger pastSpace limit). freeStart := scavenger eden start. self initSpaceForAllocationCheck: (self addressOf: scavenger eden) limit: scavengeThreshold. + gcPhaseInProgress := 0. + self resetAllocationAccountingAfterGC! - gcPhaseInProgress := 0! 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 := marking := false. becomeEffectsFlags := gcPhaseInProgress := 0. statScavenges := statIncrGCs := statFullGCs := 0. statScavengeGCUsecs := statIncrGCUsecs := statFullGCUsecs := statCompactionUsecs := statGCEndUsecs := 0. statSGCDeltaUsecs := statIGCDeltaUsecs := statFGCDeltaUsecs := 0. + statGrowMemory := statShrinkMemory := statRootTableCount := statAllocatedBytes := 0. - statGrowMemory := statShrinkMemory := statRootTableCount := 0. statRootTableOverflows := statMarkCount := 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 := SpurGenerationScavenger simulatorClass new manager: self; yourself. segmentManager := SpurSegmentManager simulatorClass new manager: self; yourself. compactor := self class compactorClass simulatorClass new manager: self; yourself. "We can also initialize here anything that is only for simulation." heapMap := CogCheck32BitHeapMap new. "N.B. We *don't* initialize extraRoots because we don't simulate it." maxOldSpaceSize := self class initializationOptions ifNotNil: [:initOpts| initOpts at: #maxOldSpaceSize ifAbsent: [0]] ifNil: [0]! Item was added: + ----- Method: SpurMemoryManager>>resetAllocationAccountingAfterGC (in category 'allocation accounting') ----- + resetAllocationAccountingAfterGC + "oldSpaceUsePriorToScavenge is used to maintain an accurate allocation count. + Since scavenging may tenure objects and tenuring does not count as allocation (that + would count twice) we must compute heapSizeAtPreviousGC after any tenuring. + fullGC reclaims space which does not count as deallocation (that would not count + allocations at all), so we must reset heapSizeAtPreviousGC after GC also." + <inline: true> + oldSpaceUsePriorToScavenge := segmentManager totalOldSpaceCapacity - totalFreeOldSpace! Item was added: + ----- Method: SpurMemoryManager>>setCurrentAllocatedBytesTo: (in category 'allocation accounting') ----- + setCurrentAllocatedBytesTo: n + "Reset the allocation count to n (n will typically be zero). Since we wish to + discount the current use we must set statAllocatedBytes to n and update + oldSpaceUsePriorToScavenge to discount the current allocated bytes." + | delta | + delta := self currentAllocatedBytes - statAllocatedBytes. + statAllocatedBytes := n. + oldSpaceUsePriorToScavenge := oldSpaceUsePriorToScavenge + delta. + self assert: self currentAllocatedBytes = n! Item was changed: + ----- Method: SpurMemoryManager>>setHeapSizeAtPreviousGC (in category 'allocation accounting') ----- - ----- Method: SpurMemoryManager>>setHeapSizeAtPreviousGC (in category 'gc - global') ----- setHeapSizeAtPreviousGC + "heapSizeAtPreviousGC is used to invoke full GC when lots of oldSpace objects are created. + Also reset oldSpaceUsePriorToScavenge." + <inline: true> + heapSizeAtPreviousGC := segmentManager totalOldSpaceCapacity - totalFreeOldSpace. + self resetAllocationAccountingAfterGC! - heapSizeAtPreviousGC := endOfMemory - nilObj - totalFreeOldSpace! Item was added: + ----- Method: SpurMemoryManager>>shouldBreakForLookupIn:given: (in category 'debug support') ----- + shouldBreakForLookupIn: lookupClass given: breakClassTag + <inline: true> + ^breakClassTag notNil + and: [lookupClass == breakClassTag + or: [(self rawHashBitsOf: lookupClass) == breakClassTag]]! Item was changed: CogClass subclass: #SpurSegmentManager + instanceVariableNames: 'manager numSegments numSegInfos segments firstSegmentSize canSwizzle sweepIndex preferredPinningSegment totalHeapSizeIncludingBridges' - instanceVariableNames: 'manager numSegments numSegInfos segments firstSegmentSize canSwizzle sweepIndex preferredPinningSegment' classVariableNames: '' poolDictionaries: '' category: 'VMMaker-SpurMemoryManager'! + !SpurSegmentManager commentStamp: 'eem 6/7/2017 14:00' prior: 0! - !SpurSegmentManager commentStamp: 'eem 11/29/2013 11:48' prior: 0! Instances of SpurSegmentManager manage oldSpace, which is organized as a sequence of segments. Segments can be obtained from the operating system and returned to the operating system when empty and shrinkage is required. Segments are kept invisible from the SpurMemoryManager by using "bridge" objects, "fake" pinned objects to bridge the gaps between segments. A pinned object header occupies the last 16 bytes of each segment, and the pinned object's size is the distance to the start of the next segment. So when the memory manager enumerates objects it skips over these bridges and memory appears linear. The constraint is that segments obtained from the operating system must be at a higher address than the first segment. The maximum size of large objects, being an overflow slot size, should be big enough to bridge the gaps, because in 32-bits the maximum size is 2^32 slots. In 64-bits the maximum size of large objects is 2^56 slots, or 2^59 bits, which we hope will suffice. When an image is written to a snapshot file the second word of the header of the bridge at the end of each segment is replaced by the size of the following segment, the segments are written to the file, and the second word of each bridge is restored. Hence the length of each segment is derived from the bridge at the end of the preceeding segment. The length of the first segment is stored in the image header as firstSegmentBytes. The start of each segment is also derived from the bridge as a delta from the start of the previous segment. The start of The first segment is stored in the image header as startOfMemory. On load all segments are read into one single segment, eliminating the bridge objects, and computing the swizzle distance for each segment, based on where the segments were in memory when the image file was written, and where the coalesced segment ends up on load. Then the segment is traversed, swizzling pointers by selecting the relevant swizzle for each oop's segment. Instance Variables + manager <SpurMemoryManager> + numSegments <Integer> + numSegInfos <Integer> + segments <Array of SpurSegmentInfo> + firstSegmentSize <Integer> + canSwizzle <Boolean> + sweepIndex <Integer> + preferredPinningSegment <SpurSegmentInfo> + totalHeapSizeIncludingBridges <integer> - manager: <SpurMemoryManager> - numSegments: <Integer> - numSegInfos: <Integer> - segments: <Array of SpurSegmentInfo> - firstSegmentSize: <Integer> - canSwizzle: <Boolean> - sweepIndex: <Integer> - preferredPinningSegment: <SpurSegmentInfo> canSwizzle - a flag set and cleared during initialization to validate that swizzling is only performed at the right time firstSegmentSize - the size of the first segment when loading an image manager - the memory manager the receiver manages segments for (simulation only) numSegInfos - the size of the segments array in units of SpurSegmentInfo size numSegments - the number of segments (the number of used entries in segments, <= numSegInfos) preferredPinningSegment - the segment in which objects should be copied when pinned, so as to cluster pinned objects in as few segments as possible. As yet unimplemented. segments - the start addresses, lengths and offsets to adjust oops on image load, for each segment sweepIndex + - a segment index used to optimize setting the containsPinned flag on segments during freeUnmarkedObjectsAndSortAndCoalesceFreeSpace + + totalHeapSizeIncludingBridges + - the total size of all segments, used to compute heap usage! - - a segment index used to optimize setting the containsPinned flag on segments during freeUnmarkedObjectsAndSortAndCoalesceFreeSpace! Item was changed: ----- Method: SpurSegmentManager class>>declareCVarsIn: (in category 'translation') ----- declareCVarsIn: aCCodeGenerator + aCCodeGenerator + var: #segments type: #'SpurSegmentInfo *'; + var: #totalHeapSizeIncludingBridges type: #usqInt! - aCCodeGenerator var: #segments type: #'SpurSegmentInfo *'! Item was changed: ----- Method: SpurSegmentManager>>addSegmentOfSize: (in category 'growing/shrinking memory') ----- addSegmentOfSize: ammount <returnTypeC: #'SpurSegmentInfo *'> <inline: false> | allocatedSize | <var: #newSeg type: #'SpurSegmentInfo *'> <var: #segAddress type: #'void *'> <var: #allocatedSize type: #'usqInt'> self cCode: [] inSmalltalk: [segments ifNil: [^nil]]. "bootstrap" (manager "sent to the manager so that the simulator can increase memory to simulate a new segment" sqAllocateMemorySegmentOfSize: ammount Above: (self firstGapOfSizeAtLeast: ammount) AllocatedSizeInto: (self cCode: [self addressOf: allocatedSize] inSmalltalk: [[:sz| allocatedSize := sz]])) ifNotNil: [:segAddress| | newSegIndex newSeg | newSegIndex := self insertSegmentFor: segAddress asUnsignedIntegerPtr. newSeg := self addressOf: (segments at: newSegIndex). newSeg segStart: segAddress asUnsignedIntegerPtr; segSize: allocatedSize. self bridgeFrom: (self addressOf: (segments at: newSegIndex - 1)) to: newSeg. self bridgeFrom: newSeg to: (newSegIndex = (numSegments - 1) ifFalse: [self addressOf: (segments at: newSegIndex + 1)]). + totalHeapSizeIncludingBridges := totalHeapSizeIncludingBridges + allocatedSize. "test isInMemory:" 0 to: numSegments - 1 do: [:i| self assert: (self isInSegments: (segments at: i) segStart). self assert: (self isInSegments: (segments at: i) segLimit - manager wordSize). self assert: ((self isInSegments: (segments at: i) segLimit) not or: [i < (numSegments - 1) and: [(segments at: i) segLimit = (segments at: i + 1) segStart]]). self assert: ((self isInSegments: (segments at: i) segStart - manager wordSize) not or: [i > 0 and: [(segments at: i - 1) segLimit = (segments at: i) segStart]])]. ^newSeg]. ^nil! Item was changed: ----- Method: SpurSegmentManager>>collapseSegmentsPostSwizzle (in category 'snapshot') ----- collapseSegmentsPostSwizzle "The image has been loaded, old segments reconstructed, and the heap swizzled into a single contiguous segment. Collapse the segments into one." <inline: false> canSwizzle := false. self cCode: [] inSmalltalk: [segments ifNil: [self allocateOrExtendSegmentInfos]]. numSegments := 1. (segments at: 0) segStart: manager oldSpaceStart; + segSize: (totalHeapSizeIncludingBridges := manager endOfMemory - manager oldSpaceStart). - segSize: manager endOfMemory - manager oldSpaceStart. manager bootstrapping ifTrue: ["finally plant a bridge at the end of the coalesced segment and cut back the manager's notion of the end of memory to immediately before the bridge." self assert: manager endOfMemory = (segments at: 0) segLimit. manager initSegmentBridgeWithBytes: manager bridgeSize at: manager endOfMemory - manager bridgeSize]. self assert: (manager isSegmentBridge: (self bridgeAt: 0)). self assert: (manager numSlotsOfAny: (self bridgeAt: 0)) = 0! Item was changed: ----- Method: SpurSegmentManager>>initialize (in category 'initialization') ----- initialize + numSegments := numSegInfos := sweepIndex := totalHeapSizeIncludingBridges := 0. - numSegments := numSegInfos := sweepIndex := 0. canSwizzle := false! Item was changed: ----- Method: SpurSegmentManager>>removeSegment: (in category 'growing/shrinking memory') ----- removeSegment: emptySeg <var: #emptySeg type: #'SpurSegmentInfo *'> | i | i := self indexOfSegment: emptySeg. self assert: i > 0. + totalHeapSizeIncludingBridges := totalHeapSizeIncludingBridges - emptySeg segSize. manager sqDeallocateMemorySegmentAt: emptySeg segStart asVoidPointer OfSize: emptySeg segSize. i to: numSegments - 1 do: [:j| segments at: j put: (segments at: j + 1)]. self cCode: [] inSmalltalk: [segments at: numSegments - 1 put: SpurSegmentInfo new]. numSegments := numSegments - 1. self bridgeFrom: (self addressOf: (segments at: i - 1)) to: (i <= (numSegments - 1) ifTrue: [self addressOf: (segments at: i)]). manager setLastSegment: (self addressOf: (segments at: numSegments - 1))! Item was changed: + ----- Method: SpurSegmentManager>>totalBytesInSegments (in category 'accessing') ----- - ----- Method: SpurSegmentManager>>totalBytesInSegments (in category 'snapshot') ----- totalBytesInSegments | total | <var: #total type: #usqInt> total := 0. 0 to: numSegments - 1 do: [:i| total := total + (segments at: i) segSize]. + self assert: totalHeapSizeIncludingBridges = total. ^total! Item was added: + ----- Method: SpurSegmentManager>>totalOldSpaceCapacity (in category 'accessing') ----- + totalOldSpaceCapacity + ^totalHeapSizeIncludingBridges - (numSegments * manager bridgeSize)! Item was changed: InterpreterPrimitives subclass: #StackInterpreter + instanceVariableNames: 'currentBytecode bytecodeSetSelector localFP localIP localSP stackLimit stackPage stackPages method instructionPointer stackPointer framePointer localReturnValue localAbsentReceiver localAbsentReceiverOrZero extA extB numExtB primitiveFunctionPointer methodCache nsMethodCache 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 breakSelector Length breakLookupClassTag longRunningPrimitiveCheckMethod longRunningPrimitiveCheckSemaphore longRunningPrimitiveStartUsecs longRunningPrimitiveStopUsecs longRunningPrimitiveGCUsecs longRunningPrimitiveCheckSequenceNumber longRunningPrimitiveSignalUndelivered checkAllocFiller tempOop tempOop2 tempOop3 theUnknownShort the2ndUnknownShort imageFloatsBigEndian maxExtSemTabSizeSet lastMethodCacheProbeWrite gcSemaphoreIndex classByteArrayCompactIndex checkedPluginName nativeSP nativeStackPointer lowcodeCalloutState shadowCallStackPointer displayBits displayWidth displayHeight displayDepth statForceInterruptCheck statStackOverflow statStackPageDivorce statCheckForEvents statProcessSwitch statIOProcessEvents statPendingFinalizationSignals statIdleUsecs debugCallbackPath debugCallbackReturns debugCallbackInvokes' - instanceVariableNames: 'currentBytecode bytecodeSetSelector localFP localIP localSP stackLimit stackPage stackPages method instructionPointer stackPointer framePointer localReturnValue localAbsentReceiver localAbsentReceiverOrZero extA extB numExtB primitiveFunctionPointer methodCache nsMethodCache 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 breakSelector Length longRunningPrimitiveCheckMethod longRunningPrimitiveCheckSemaphore longRunningPrimitiveStartUsecs longRunningPrimitiveStopUsecs longRunningPrimitiveGCUsecs longRunningPrimitiveCheckSequenceNumber longRunningPrimitiveSignalUndelivered checkAllocFiller tempOop tempOop2 tempOop3 theUnknownShort the2ndUnknownShort imageFloatsBigEndian maxExtSemTabSizeSet lastMethodCacheProbeWrite gcSemaphoreIndex classByteArrayCompactIndex checkedPluginName nativeSP nativeStackPointer lowcodeCalloutState shadowCallStackPointer displayBits displayWidth displayHeight displayDepth statForceInterruptCheck statStackOverflow statStackPageDivorce statCheckForEvents statProcessSwitch statIOProcessEvents statPendingFinalizationSignals statIdleUsecs debugCallbackPath debugCallbackReturns debugCallbackInvokes' classVariableNames: 'AccessModifierPrivate AccessModifierProtected AccessModifierPublic AltBytecodeEncoderClassName AltLongStoreBytecode AlternateHeaderHasPrimFlag AlternateHeaderIsOptimizedFlag AlternateHeaderNumLiteralsMask AtCacheFixedFields AtCacheFmt AtCacheMask AtCacheOop AtCacheSize AtCacheTotalSize AtPutBase BytecodeEncoderClassName BytecodeTable CacheProbeMax DirBadPath DirEntryFound DirNoMoreEntries DumpStackOnLowSpace EnclosingMixinIndex EnclosingObjectIndex EnforceAccessControl FailImbalancedPrimitives LongStoreBytecode MaxExternalPrimitiveTableSize MaxJumpBuf MaxPrimitiveIndex MaxQuickPrimitiveIndex MethodHeaderArgCountShift MethodHeaderFlagBitPosition MethodHeaderTempCountShift MixinIndex PrimNumberDoExternalCall PrimNumberExternalCall PrimNumberFFICall PrimitiveTable StackPageReachedButUntraced StackPageTraceInvalid StackPageTraced StackPageUnreached V3PrimitiveBitsMask' poolDictionaries: 'VMBasicConstants VMBytecodeConstants VMMethodCacheConstants VMObjectIndices VMSpurObjectRepresentationConstants VMSqueakClassIndices VMStackFrameOffsets' category: 'VMMaker-Interpreter'! !StackInterpreter commentStamp: 'eem 12/5/2014 11:32' 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 f rame 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. StackInterpreter and subclasses support multiple memory managers. Currently there are two. NewMemoryManager is a slightly refined version of ObjectMemory, and is the memory manager and garbage collector for the original Squeak object representation as described in "Back to the Future The Story of Squeak, A Practical Smalltalk Written in Itself", see http://ftp.squeak.org/docs/OOPSLA.Squeak.html. Spur is a faster, more regular object representation that is designed for more performance and functionality, and to have a common header format for both 32-bit and 64-bit versions. You can read about it in SpurMemoryManager's class comment. There is also a video of a presentation at ESUG 2014 (https://www.youtube.com/watch?v=k0nBNS1aHZ4), along with slides (http://www.slideshare.net/esug/spur-a-new-object-representation-for-cog?rel…).! Item was changed: ----- Method: StackInterpreter class>>mustBeGlobal: (in category 'translation') ----- mustBeGlobal: var "Answer if a variable must be global and exported. Used for inst vars that are accessed from VM support code." ^(super mustBeGlobal: var) or: [(self objectMemoryClass mustBeGlobal: var) or: [(#('interpreterProxy' 'interpreterVersion' 'inIOProcessEvents' 'deferDisplayUpdates' 'extraVMMemory' 'showSurfaceFn' 'displayBits' 'displayWidth' 'displayHeight' 'displayDepth' 'desiredNumStackPages' 'desiredEdenBytes' + 'breakLookupClassTag' 'breakSelector' 'breakSelectorLength' 'sendTrace' 'checkAllocFiller' 'checkedPluginName' - 'breakSelector' 'breakSelectorLength' 'sendTrace' 'checkAllocFiller' 'checkedPluginName' 'suppressHeartbeatFlag' 'debugCallbackInvokes' 'debugCallbackPath' 'debugCallbackReturns') includes: var) or: [ "This allows slow machines to define bytecodeSetSelector as 0 to avoid the interpretation overhead." MULTIPLEBYTECODESETS not and: [var = 'bytecodeSetSelector']]]]! Item was added: + ----- Method: StackInterpreter>>lookupBreakFor: (in category 'debug support') ----- + lookupBreakFor: lookupClass + <inline: true> + (objectMemory shouldBreakForLookupIn: lookupClass given: breakLookupClassTag) ifTrue: + [self + cCode: [self warning: 'lookup class send break (heartbeat suppressed)'] + inSmalltalk: [self halt: 'Lookup in class ', lookupClass hex]]! Item was changed: ----- Method: StackInterpreter>>lookupLexical:from:rule: (in category 'message sending') ----- lookupLexical: selector from: mixin rule: rule "A shared part of the lookup for implicit receiver sends that found a lexically visible method, and self and outer sends." | receiverClass mixinApplication dictionary found | receiverClass := objectMemory fetchClassOf: localAbsentReceiver. + self lookupBreakFor: receiverClass. lkupClass := receiverClass. "MNU lookup starts here." mixinApplication := self findApplicationOfTargetMixin: mixin startingAtBehavior: receiverClass. dictionary := objectMemory followObjField: MethodDictionaryIndex ofObject: mixinApplication. found := self lookupMethodInDictionary: dictionary. (found and: [(self isPrivateMethod: newMethod)]) ifTrue: [^rule]. ^self lookupProtected: selector startingAt: receiverClass rule: rule ! Item was changed: ----- Method: StackInterpreter>>lookupMNU (in category 'message sending') ----- lookupMNU "A send lookup failed. Replace the arguments on the stack with a Message and lookup #doesNotUndestand: starting at lkupClass. Note that MNU lookup ignores access modifiers. This makes it different from an ordinary send of #doesNotUnderstand:, which must only find public methods. IN: lkupClass IN: messageSelector IN: argumentCount OUT: newMethod OUT: primitiveIndex RESULT: LookupRuleMNU" | currentClass dictionary found | + self lookupBreakFor: lkupClass. self createActualMessageTo: lkupClass. messageSelector := objectMemory splObj: SelectorDoesNotUnderstand. currentClass := lkupClass. [currentClass ~= objectMemory nilObject] whileTrue: [dictionary := objectMemory followObjField: MethodDictionaryIndex ofObject: currentClass. found := self lookupMethodInDictionary: dictionary. found ifTrue: [^LookupRuleMNU]. currentClass := self superclassOf: currentClass]. self error: 'Recursive not understood error encountered' ! Item was changed: ----- Method: StackInterpreter>>lookupMNUInClass: (in category 'message sending') ----- lookupMNUInClass: class "Lookup messageSelector in class. Answer 0 on success. Answer the splObj: index for the error selector to use on failure rather than performing MNU processing etc." | currentClass dictionary found | <inline: false> + self lookupBreakFor: class. currentClass := class. [currentClass ~= objectMemory nilObject] whileTrue: [dictionary := objectMemory followObjField: MethodDictionaryIndex ofObject: currentClass. dictionary = objectMemory nilObject ifTrue: [lkupClass := self superclassOf: currentClass. ^SelectorCannotInterpret]. found := self lookupMethodInDictionary: dictionary. NewspeakVM ifTrue: [found ifTrue: [lkupClass := class. self addNewMethodToNSCache: LookupRuleMNU. ^0]] ifFalse: [found ifTrue: [self addNewMethodToCache: class. ^0]]. currentClass := self superclassOf: currentClass]. lkupClass := class. ^SelectorDoesNotUnderstand! Item was changed: ----- Method: StackInterpreter>>lookupMethodInClass: (in category 'message sending') ----- lookupMethodInClass: class | currentClass dictionary found | <inline: false> self assert: (self addressCouldBeClassObj: class). + self lookupBreakFor: class. currentClass := class. [currentClass ~= objectMemory nilObject] whileTrue: [dictionary := objectMemory followObjField: MethodDictionaryIndex ofObject: currentClass. dictionary = objectMemory nilObject ifTrue: ["MethodDict pointer is nil (hopefully due a swapped out stub) -- raise exception #cannotInterpret:." self createActualMessageTo: class. messageSelector := objectMemory splObj: SelectorCannotInterpret. self sendBreakpoint: messageSelector receiver: nil. ^self lookupMethodInClass: (self superclassOf: currentClass)]. found := self lookupMethodInDictionary: dictionary. found ifTrue: [^currentClass]. currentClass := self superclassOf: currentClass]. "Could not find #doesNotUnderstand: -- unrecoverable error." messageSelector = (objectMemory splObj: SelectorDoesNotUnderstand) ifTrue: [self error: 'Recursive not understood error encountered']. "Cound not find a normal message -- raise exception #doesNotUnderstand:" self createActualMessageTo: class. messageSelector := objectMemory splObj: SelectorDoesNotUnderstand. self sendBreak: messageSelector + objectMemory baseHeaderSize point: (objectMemory lengthOf: messageSelector) receiver: nil. ^self lookupMethodInClass: class! Item was changed: ----- Method: StackInterpreter>>lookupOrdinaryNoMNUEtcInClass: (in category 'message sending') ----- lookupOrdinaryNoMNUEtcInClass: class "Lookup messageSelector in class. Answer 0 on success. Answer the splObj: index for the error selector to use on failure rather than performing MNU processing etc." | currentClass dictionary found | <inline: false> + self lookupBreakFor: class. currentClass := class. [currentClass ~= objectMemory nilObject] whileTrue: [dictionary := objectMemory followObjField: MethodDictionaryIndex ofObject: currentClass. dictionary = objectMemory nilObject ifTrue: [lkupClass := self superclassOf: currentClass. ^SelectorCannotInterpret]. found := self lookupMethodInDictionary: dictionary. NewspeakVM ifTrue: [found ifTrue: [(self isPublicMethod: newMethod) ifTrue: [self addNewMethodToCache: class. ^0]. (self isProtectedMethod: newMethod) ifTrue: [lkupClass := class. ^SelectorDoesNotUnderstand]]] ifFalse: [found ifTrue: [self addNewMethodToCache: class. ^0]]. currentClass := self superclassOf: currentClass]. lkupClass := class. ^SelectorDoesNotUnderstand! Item was changed: ----- Method: StackInterpreter>>lookupOrdinarySend (in category 'message sending') ----- lookupOrdinarySend "Do the full lookup for an ordinary send (i.e., a Newspeak or Smalltalk ordinary send or a Smalltalk super send). IN: lkupClass IN: messageSelector IN: argumentCount OUT: newMethod OUT: primitiveIndex RESULT: LookupRuleOrdinary or LookupRuleMNU" <option: #NewspeakVM> | currentClass dictionary found | self assert: (self addressCouldBeClassObj: lkupClass). + self lookupBreakFor: lkupClass. currentClass := lkupClass. [currentClass ~= objectMemory nilObject] whileTrue: [dictionary := objectMemory followObjField: MethodDictionaryIndex ofObject: currentClass. found := self lookupMethodInDictionary: dictionary. found ifTrue: [(self isPublicMethod: newMethod) ifTrue: [^LookupRuleOrdinary]. (self isProtectedMethod: newMethod) ifTrue: [^self lookupMNU]]. currentClass := self superclassOf: currentClass]. ^self lookupMNU! Item was changed: ----- Method: StackInterpreter>>lookupProtected:startingAt:rule: (in category 'message sending') ----- lookupProtected: selector startingAt: mixinApplication rule: rule "A shared part of the lookup for self, outer or implicit receiver sends that did not find a private lexically visible method, and (Newspeak) super sends." | currentClass dictionary found | + self lookupBreakFor: mixinApplication. currentClass := mixinApplication. [currentClass = objectMemory nilObject] whileFalse: [dictionary := objectMemory followObjField: MethodDictionaryIndex ofObject: currentClass. found := self lookupMethodInDictionary: dictionary. (found and: [(self isPrivateMethod: newMethod) not]) ifTrue: [^rule]. currentClass := self superclassOf: currentClass]. ^self lookupMNU! Item was changed: ----- Method: StackInterpreterPrimitives>>primitiveVMParameter (in category 'system control primitives') ----- (excessive size, no diff calculated)

1 0

VM Maker: VMMaker.oscog-eem.2236.mcz
by commits＠source.squeak.org 07 Jun '17

07 Jun '17

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.2236.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.2236 Author: eem Time: 7 June 2017, 2:57:18.014718 pm UUID: ddbf0087-58d9-4b7a-847e-b80252e68b52 Ancestors: VMMaker.oscog-eem.2235 StackInterpreter: Fix some simulation and initialization issues. make sure to send str:cmp: et al to interpreterProxy (which is an object memory during simulation) to avoid the deprecation warning on byteAt:. Make sure BytecodeSetHasExtensions is initialized in the negative for SqueakV3. Make sure initializationOptions is initialzatied before using compactorClass in SpurMemoryManager class. =============== Diff against VMMaker.oscog-eem.2235 =============== Item was changed: ----- Method: FilePluginSimulator>>fileOpenName:size:write:secure: (in category 'file primitives') ----- fileOpenName: nameIndex size: nameSize write: writeFlag secure: secureFlag "Open the named file, possibly checking security. Answer the file oop." | path f index | openFiles size >= maxOpenFiles ifTrue: [^interpreterProxy primitiveFailFor: PrimErrLimitExceeded]. + path := interpreterProxy asString: nameIndex size: nameSize. - path := interpreterProxy interpreter asString: nameIndex size: nameSize. f := writeFlag ifTrue: [FileStream fileNamed: path] ifFalse: [(StandardFileStream isAFileNamed: path) ifTrue: [FileStream readOnlyFileNamed: path]]. f ifNil: [^interpreterProxy primitiveFail]. f binary. index := openFiles size + 1. openFiles at: index put: f. ^interpreterProxy integerObjectOf: index! Item was changed: ----- Method: FilePluginSimulator>>sqFile:Read:Into:At: (in category 'simulation') ----- sqFile: file Read: count Into: byteArrayIndexArg At: startIndex + | byteArrayIndex | - | interpreter byteArrayIndex | - interpreter := interpreterProxy interpreter. byteArrayIndex := byteArrayIndexArg asInteger. "Coerces CArray et al correctly" [[startIndex to: startIndex + count - 1 do: [ :i | file atEnd ifTrue: [(file isKindOf: FakeStdinStream) ifTrue: [file atEnd: false]. ^i - startIndex]. + interpreterProxy - interpreter byteAt: byteArrayIndex + i put: (file next ifNil: [(file isKindOf: FakeStdinStream) ifTrue: [^0]] ifNotNil: [:c| c asInteger])]] on: Error do: [:ex| (file isKindOf: TranscriptStream) ifFalse: [ex pass]. ^0]] ensure: [self recordStateOf: file]. ^count! Item was changed: ----- Method: FilePluginSimulator>>sqFile:Write:From:At: (in category 'simulation') ----- sqFile: file Write: count From: byteArrayIndexArg At: startIndex + | byteArrayIndex | - | interpreter byteArrayIndex | - interpreter := interpreterProxy interpreter. byteArrayIndex := byteArrayIndexArg asInteger. "Coerces CArray et al correctly" file isBinary ifTrue: [startIndex to: startIndex + count - 1 do: + [ :i | file nextPut: (interpreterProxy byteAt: byteArrayIndex + i)]] - [ :i | file nextPut: (interpreter byteAt: byteArrayIndex + i)]] ifFalse: [startIndex to: startIndex + count - 1 do: [ :i | | byte | + byte := interpreterProxy byteAt: byteArrayIndex + i. - byte := interpreter byteAt: byteArrayIndex + i. file nextPut: (Character value: (byte == 12 "lf" ifTrue: [15"cr"] ifFalse: [byte]))]]. self recordStateOf: file. ^count! Item was changed: ----- Method: SpurMemoryManager class>>ancilliaryClasses: (in category 'translation') ----- ancilliaryClasses: options + initializationOptions ifNil: [initializationOptions := options]. ^{ SpurGenerationScavenger. SpurSegmentManager. SpurSegmentInfo. self compactorClass }, SpurNewSpaceSpace withAllSubclasses! Item was changed: ----- Method: StackInterpreter class>>initializeBytecodeTableForSqueakV3PlusClosures (in category 'initialization') ----- initializeBytecodeTableForSqueakV3PlusClosures "StackInterpreter initializeBytecodeTableForSqueakV3PlusClosures" "Note: This table will be used to generate a C switch statement." initializationOptions at: #SqueakV3PlusClosuresBytecodeSet put: (SqueakV3PlusClosuresBytecodeSet := true). BytecodeTable := Array new: 256. BytecodeEncoderClassName := #EncoderForV3PlusClosures. LongStoreBytecode := 129. + BytecodeSetHasExtensions := false. self table: BytecodeTable from: #( ( 0 15 pushReceiverVariableBytecode) ( 16 31 pushTemporaryVariableBytecode) ( 32 63 pushLiteralConstantBytecode) ( 64 95 pushLiteralVariableBytecode) ( 96 103 storeAndPopReceiverVariableBytecode) (104 111 storeAndPopTemporaryVariableBytecode) (112 pushReceiverBytecode) (113 pushConstantTrueBytecode) (114 pushConstantFalseBytecode) (115 pushConstantNilBytecode) (116 pushConstantMinusOneBytecode) (117 pushConstantZeroBytecode) (118 pushConstantOneBytecode) (119 pushConstantTwoBytecode) (120 returnReceiver) (121 returnTrue) (122 returnFalse) (123 returnNil) (124 returnTopFromMethod) (125 returnTopFromBlock) (126 127 unknownBytecode) (128 extendedPushBytecode) (129 extendedStoreBytecode) (130 extendedStoreAndPopBytecode) (131 singleExtendedSendBytecode) (132 doubleExtendedDoAnythingBytecode) (133 singleExtendedSuperBytecode) (134 secondExtendedSendBytecode) (135 popStackBytecode) (136 duplicateTopBytecode) (137 pushActiveContextBytecode) (138 pushNewArrayBytecode)), ((initializationOptions at: #SpurObjectMemory ifAbsent: [false]) ifTrue: [#((139 callPrimitiveBytecode))] "V3PlusClosures on Spur" ifFalse: [#((139 unknownBytecode))]), "V3PlusClosures on V3" #( (140 pushRemoteTempLongBytecode) (141 storeRemoteTempLongBytecode) (142 storeAndPopRemoteTempLongBytecode) (143 pushClosureCopyCopiedValuesBytecode) (144 151 shortUnconditionalJump) (152 159 shortConditionalJumpFalse) (160 167 longUnconditionalJump) (168 171 longJumpIfTrue) (172 175 longJumpIfFalse) "176-191 were sendArithmeticSelectorBytecode" (176 bytecodePrimAdd) (177 bytecodePrimSubtract) (178 bytecodePrimLessThan) (179 bytecodePrimGreaterThan) (180 bytecodePrimLessOrEqual) (181 bytecodePrimGreaterOrEqual) (182 bytecodePrimEqual) (183 bytecodePrimNotEqual) (184 bytecodePrimMultiply) (185 bytecodePrimDivide) (186 bytecodePrimMod) (187 bytecodePrimMakePoint) (188 bytecodePrimBitShift) (189 bytecodePrimDiv) (190 bytecodePrimBitAnd) (191 bytecodePrimBitOr) "192-207 were sendCommonSelectorBytecode" (192 bytecodePrimAt) (193 bytecodePrimAtPut) (194 bytecodePrimSize) (195 bytecodePrimNext) (196 bytecodePrimNextPut) (197 bytecodePrimAtEnd) (198 bytecodePrimIdentical) (199 bytecodePrimClass) (200 bytecodePrimNotIdentical) "was bytecodePrimSpecialSelector24 / blockCopy" (201 bytecodePrimValue) (202 bytecodePrimValueWithArg) (203 bytecodePrimDo) (204 bytecodePrimNew) (205 bytecodePrimNewWithArg) (206 bytecodePrimPointX) (207 bytecodePrimPointY) (208 223 sendLiteralSelector0ArgsBytecode) (224 239 sendLiteralSelector1ArgBytecode) (240 255 sendLiteralSelector2ArgsBytecode) )! Item was changed: ----- Method: StackInterpreter>>initializeExtraClassInstVarIndices (in category 'initialization') ----- initializeExtraClassInstVarIndices "Initialize metaclassNumSlots and thisClassIndex which are used in debug printing, and classNameIndex which is used not only for debug printing but for is:KindOf: & is:MemberOf: via classNameOf:is: (evil but a reality we have to accept)." | classArrayObj classArrayClass | classArrayObj := objectMemory splObj: ClassArray. classArrayClass := objectMemory fetchClassOfNonImm: classArrayObj. metaclassNumSlots := objectMemory numSlotsOf: classArrayClass. "determine actual Metaclass instSize" thisClassIndex := 5. "default" InstanceSpecificationIndex + 1 to: (objectMemory lengthOf: classArrayClass) do: [:i| (objectMemory fetchPointer: i - 1 ofObject: classArrayClass) = classArrayObj ifTrue: [thisClassIndex := i - 1]]. classNameIndex := 6. "default" InstanceSpecificationIndex + 1 to: (objectMemory lengthOf: classArrayObj) do: [:i| | oop | oop := objectMemory fetchPointer: i - 1 ofObject: classArrayObj. ((objectMemory isBytes: oop) and: [(objectMemory lengthOf: oop) = 5 + and: [(objectMemory str: 'Array' n: (objectMemory firstFixedField: oop) cmp: 5) = 0]]) ifTrue: - and: [(self str: 'Array' n: (objectMemory firstFixedField: oop) cmp: 5) = 0]]) ifTrue: [classNameIndex := i - 1]]!

1 0

can I have right to http://www.squeaksource.com/OSProcessPlugin ?
by Esteban Lorenzano 07 Jun '17

07 Jun '17

Hi Dave, list I want to commit some changes to OSProcessPlugin. Can I have rights to that repository? thanks, Esteban ps: I need to insist in the necessity of having all VM plugins (the “official” ones: those who are compiled with the osvm builds) in the same place. Otherwise this is a horrible (and irreproducible) process.

3 6

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev June 2017