Vm-dev May 2016

vm-dev@lists.squeakfoundation.org

36 participants
150 discussions

Re: [Vm-dev] VM Maker: VMMaker.oscog-cb.1875.mcz
by Clément Bera 27 May '16

27 May '16

Hi, Final results: | Immutability overhead before this commit | Immutability overhead now setter (setting 1 IV with arg) | 18.3% | 4.8% imm:nonImm: method (4 IV) | 18.7% | 2.6% So I believe the immutability / write barrier overhead can be up to 5% in some cases. However, the Binarytree bench is intensive in instance variable stores and there is no visible difference in performance. If Eliot validates the commit, I consider now that immutability integration in Cog is finished. We still plan to change the implementation of uncommon trampolines (mustBeBoolean and cannotAssign:withIndex:) to optimize register allocation, which is indirectly related. On Fri, May 27, 2016 at 11:43 AM, <commits(a)source.squeak.org> wrote: > > ClementBera uploaded a new version of VMMaker to project VM Maker: > http://source.squeak.org/VMMaker/VMMaker.oscog-cb.1875.mcz > > ==================== Summary ==================== > > Name: VMMaker.oscog-cb.1875 > Author: cb > Time: 27 May 2016, 11:43:40.369719 am > UUID: 4da4e9c0-8ef3-4400-b610-73c7959006ce > Ancestors: VMMaker.oscog-eem.1874 > > Anti-slavery society forms (NY)... > > When I benched Immutability/write barrier, games benchmarks had identical > performance with and without it (the difference was within noise). > > However I built a microbench doing only inst var stores: > > Foo>>imm: imm nonImm: nonImm > iv1 := 1. > iv2 := #foo. > iv3 := imm. > iv4 := nonImm. > > | f | > f := Foo new. > [f imm: 2 nonImm: #bar ] bench > > And in this case there was 18.7% overhead with the write barrier. > BinaryTree bench has a similar method, use it extensively and yet we can't > see the overhead on the whole bench, so it's not that critical, but it's > still something which could matter in specific cases. > > In this commit I changed the JIT so that (with Immutability/Write barrier > ON) methods with only frameless instance variable stores are compiled with > two paths. The code first checks if the receiver is immutable/read-only, > and takes the right path accordingly. The first path is frameless and does > not include immutability/write barrier checks. The second one is frameful > and does all the immutability/write barrier checks. > > I didn't do it for blocks as I believe blocks with only instance variable > store are not that common - I may be wrong, if you prove to me I am wrong > on this with numbers, I will do it for blocks. > > In the micro-bench shown, #imm:nonImm:, the overhead decreased from 18.7% > to 2.6%. > > I think this has an impact in general to setter methods. > > I made that in a Pharo sprint (or what it matters). > > =============== Diff against VMMaker.oscog-eem.1874 =============== > > Item was changed: > ----- Method: RegisterAllocatingCogit>>scanMethod (in category 'compile > abstract instructions') ----- > scanMethod > "Overrides to count the number of fixups." > "Scan the method (and all embedded blocks) to determine > - what the last bytecode is; extra bytes at the end of a > method are used to encode things like source pointers or temp names > - if the method needs a frame or not > - what are the targets of any backward branches. > - how many blocks it creates > Answer the block count or on error a negative error code" > | latestContinuation nExts descriptor pc numBlocks distance > targetPC framelessStackDelta | > <var: #descriptor type: #'BytecodeDescriptor *'> > needsFrame := false. > numFixups := 0. > prevBCDescriptor := nil. > + self > + cppIf: IMMUTABILITY > + ifTrue: [needsTwoPath := false]. > NewspeakVM ifTrue: > [numIRCs := 0]. > (primitiveIndex > 0 > and: [coInterpreter isQuickPrimitiveIndex: primitiveIndex]) > ifTrue: > [^0]. > pc := latestContinuation := initialPC. > numBlocks := framelessStackDelta := nExts := extA := extB := 0. > [pc <= endPC] whileTrue: > [byte0 := (objectMemory fetchByte: pc ofObject: methodObj) > + bytecodeSetOffset. > descriptor := self generatorAt: byte0. > descriptor isExtension ifTrue: > [descriptor opcode = Nop ifTrue: "unknown bytecode > tag; see Cogit class>>#generatorTableFrom:" > [^EncounteredUnknownBytecode]. > self loadSubsequentBytesForDescriptor: descriptor > at: pc. > self perform: descriptor generator]. > (descriptor isReturn > and: [pc >= latestContinuation]) ifTrue: > [endPC := pc]. > + self > + cppIf: IMMUTABILITY > + ifTrue: [(needsFrame and: [needsTwoPath not]) > + ifFalse: [(descriptor > needsFrameFunction isNil > + or: [self > perform: descriptor needsFrameFunction with: framelessStackDelta]) > + ifTrue: > [needsFrame := true. > + > needsTwoPath := descriptor generator == > #genStoreAndPopReceiverVariableBytecode] > + ifFalse: > [framelessStackDelta := framelessStackDelta + descriptor stackDelta]]] > + ifFalse: [needsFrame > + ifFalse: [(descriptor > needsFrameFunction isNil > + or: [self > perform: descriptor needsFrameFunction with: framelessStackDelta]) > + ifTrue: > [needsFrame := true] > + ifFalse: > [framelessStackDelta := framelessStackDelta + descriptor stackDelta]]]. > - needsFrame ifFalse: > - [(descriptor needsFrameFunction isNil > - or: [self perform: descriptor needsFrameFunction > with: framelessStackDelta]) > - ifTrue: [needsFrame := true] > - ifFalse: [framelessStackDelta := > framelessStackDelta + descriptor stackDelta]]. > descriptor isBranch ifTrue: > [distance := self spanFor: descriptor at: pc exts: > nExts in: methodObj. > targetPC := pc + descriptor numBytes + distance. > (self isBackwardBranch: descriptor at: pc exts: > nExts in: methodObj) > ifTrue: [self initializeFixupAt: targetPC > - initialPC] > ifFalse: > [latestContinuation := > latestContinuation max: targetPC. > numFixups := numFixups + 1]]. > descriptor isBlockCreation ifTrue: > [numBlocks := numBlocks + 1. > distance := self spanFor: descriptor at: pc exts: > nExts in: methodObj. > targetPC := pc + descriptor numBytes + distance. > latestContinuation := latestContinuation max: > targetPC. > numFixups := numFixups + 1]. > NewspeakVM ifTrue: > [descriptor hasIRC ifTrue: > [numIRCs := numIRCs + 1]]. > pc := pc + descriptor numBytes. > descriptor isExtension > ifTrue: [nExts := nExts + 1] > ifFalse: [nExts := extA := extB := 0]. > prevBCDescriptor := descriptor]. > ^numBlocks! > > Item was changed: > ----- Method: SistaCogit>>scanMethod (in category 'compile abstract > instructions') ----- > scanMethod > "Scan the method (and all embedded blocks) to determine > - what the last bytecode is; extra bytes at the end of a > method are used to encode things like source pointers or temp names > - if the method needs a frame or not > - what are the targets of any backward branches. > - how many blocks it creates > - how many counters it needs/conditional branches it > contains > Answer the block count or on error a negative error code" > | latestContinuation nExts descriptor pc numBlocks distance > targetPC framelessStackDelta numFixups | > <var: #descriptor type: #'BytecodeDescriptor *'> > self flag: 'numFixup should be reverted to inst var when moving > back sistaCogit as subclass of RegisterAllocatingCogit'. > needsFrame := false. > numFixups := 0. > prevBCDescriptor := nil. > numCounters := 0. > + self > + cppIf: IMMUTABILITY > + ifTrue: [needsTwoPath := false]. > NewspeakVM ifTrue: > [numIRCs := 0]. > (primitiveIndex > 0 > and: [coInterpreter isQuickPrimitiveIndex: primitiveIndex]) > ifTrue: > [^0]. > pc := latestContinuation := initialPC. > numBlocks := framelessStackDelta := nExts := extA := extB := 0. > [pc <= endPC] whileTrue: > [byte0 := (objectMemory fetchByte: pc ofObject: methodObj) > + bytecodeSetOffset. > descriptor := self generatorAt: byte0. > descriptor isExtension ifTrue: > [descriptor opcode = Nop ifTrue: "unknown bytecode > tag; see Cogit class>>#generatorTableFrom:" > [^EncounteredUnknownBytecode]. > self loadSubsequentBytesForDescriptor: descriptor > at: pc. > self perform: descriptor generator]. > (descriptor isReturn > and: [pc >= latestContinuation]) ifTrue: > [endPC := pc]. > + self > + cppIf: IMMUTABILITY > + ifTrue: [(needsFrame and: [needsTwoPath not]) > + ifFalse: [(descriptor > needsFrameFunction isNil > + or: [self > perform: descriptor needsFrameFunction with: framelessStackDelta]) > + ifTrue: > [needsFrame := true. > + > needsTwoPath := descriptor generator == > #genStoreAndPopReceiverVariableBytecode] > + ifFalse: > [framelessStackDelta := framelessStackDelta + descriptor stackDelta]]] > + ifFalse: [needsFrame > + ifFalse: [(descriptor > needsFrameFunction isNil > + or: [self > perform: descriptor needsFrameFunction with: framelessStackDelta]) > + ifTrue: > [needsFrame := true] > + ifFalse: > [framelessStackDelta := framelessStackDelta + descriptor stackDelta]]]. > - needsFrame ifFalse: > - [(descriptor needsFrameFunction isNil > - or: [self perform: descriptor needsFrameFunction > with: framelessStackDelta]) > - ifTrue: [needsFrame := true] > - ifFalse: [framelessStackDelta := > framelessStackDelta + descriptor stackDelta]]. > descriptor isBranch ifTrue: > [distance := self spanFor: descriptor at: pc exts: > nExts in: methodObj. > targetPC := pc + descriptor numBytes + distance. > (self isBackwardBranch: descriptor at: pc exts: > nExts in: methodObj) > ifTrue: [self initializeFixupAt: targetPC > - initialPC] > ifFalse: > [latestContinuation := > latestContinuation max: targetPC. > numFixups := numFixups + 1. > (descriptor isBranchTrue or: > [descriptor isBranchFalse]) ifTrue: > [numCounters := > numCounters + 1]]]. > descriptor isBlockCreation ifTrue: > [numBlocks := numBlocks + 1. > distance := self spanFor: descriptor at: pc exts: > nExts in: methodObj. > targetPC := pc + descriptor numBytes + distance. > latestContinuation := latestContinuation max: > targetPC. > numFixups := numFixups + 1]. > NewspeakVM ifTrue: > [descriptor hasIRC ifTrue: > [numIRCs := numIRCs + 1]]. > pc := pc + descriptor numBytes. > descriptor isExtension > ifTrue: [nExts := nExts + 1] > ifFalse: [nExts := extA := extB := 0]. > prevBCDescriptor := descriptor]. > ^numBlocks! > > Item was changed: > SimpleStackBasedCogit subclass: #StackToRegisterMappingCogit > + instanceVariableNames: 'prevBCDescriptor numPushNilsFunction > pushNilSizeFunction methodOrBlockNumTemps regArgsHaveBeenPushed simSelf > simStack simStackPtr simSpillBase optStatus > ceCallCogCodePopReceiverArg0Regs ceCallCogCodePopReceiverArg1Arg0Regs > methodAbortTrampolines picAbortTrampolines picMissTrampolines > ceCall0ArgsPIC ceCall1ArgsPIC ceCall2ArgsPIC debugStackPointers > debugFixupBreaks realCECallCogCodePopReceiverArg0Regs > realCECallCogCodePopReceiverArg1Arg0Regs deadCode needsTwoPath' > - instanceVariableNames: 'prevBCDescriptor numPushNilsFunction > pushNilSizeFunction methodOrBlockNumTemps regArgsHaveBeenPushed simSelf > simStack simStackPtr simSpillBase optStatus > ceCallCogCodePopReceiverArg0Regs ceCallCogCodePopReceiverArg1Arg0Regs > methodAbortTrampolines picAbortTrampolines picMissTrampolines > ceCall0ArgsPIC ceCall1ArgsPIC ceCall2ArgsPIC debugStackPointers > debugFixupBreaks realCECallCogCodePopReceiverArg0Regs > realCECallCogCodePopReceiverArg1Arg0Regs deadCode' > classVariableNames: 'NeedsMergeFixupFlag NeedsNonMergeFixupFlag' > poolDictionaries: 'CogCompilationConstants VMMethodCacheConstants > VMObjectIndices VMStackFrameOffsets' > category: 'VMMaker-JIT'! > StackToRegisterMappingCogit class > instanceVariableNames: 'numPushNilsFunction pushNilSizeFunction'! > > !StackToRegisterMappingCogit commentStamp: 'eem 12/19/2010 18:12' prior: > 0! > StackToRegisterMappingCogit is an optimizing code generator that > eliminates a lot of stack operations and inlines some special selector > arithmetic. It does so by a simple stack-to-register mapping scheme based > on deferring the generation of code to produce operands until > operand-consuming operations. The operations that consume operands are > sends, stores and returns. > > See methods in the class-side documentation protocol for more detail. > > Instance Variables > callerSavedRegMask: > <Integer> > ceEnter0ArgsPIC: > <Integer> > ceEnter1ArgsPIC: > <Integer> > ceEnter2ArgsPIC: > <Integer> > ceEnterCogCodePopReceiverArg0Regs: <Integer> > ceEnterCogCodePopReceiverArg1Arg0Regs: <Integer> > debugBytecodePointers: > <Set of Integer> > debugFixupBreaks: > <Set of Integer> > debugStackPointers: > <CArrayAccessor of (Integer|nil)> > methodAbortTrampolines: > <CArrayAccessor of Integer> > methodOrBlockNumTemps: > <Integer> > optStatus: > <Integer> > picAbortTrampolines: > <CArrayAccessor of Integer> > picMissTrampolines: > <CArrayAccessor of Integer> > realCEEnterCogCodePopReceiverArg0Regs: <Integer> > realCEEnterCogCodePopReceiverArg1Arg0Regs: <Integer> > regArgsHaveBeenPushed: > <Boolean> > simSelf: > <CogSimStackEntry> > simSpillBase: > <Integer> > simStack: > <CArrayAccessor of CogSimStackEntry> > simStackPtr: > <Integer> > traceSimStack: > <Integer> > > callerSavedRegMask > - the bitmask of the ABI's caller-saved registers > > ceEnter0ArgsPIC ceEnter1ArgsPIC ceEnter2ArgsPIC > - the trampoline for entering an N-arg PIC > > ceEnterCogCodePopReceiverArg0Regs ceEnterCogCodePopReceiverArg1Arg0Regs > - teh trampoline for entering a method with N register args > > debugBytecodePointers > - a Set of bytecode pcs for setting breakpoints (simulation only) > > debugFixupBreaks > - a Set of fixup indices for setting breakpoints (simulation only) > > debugStackPointers > - an Array of stack depths for each bytecode for code verification > > methodAbortTrampolines > - a CArrayAccessor of abort trampolines for 0, 1, 2 and N args > > methodOrBlockNumTemps > - the number of method or block temps (including args) in the > current compilation unit (method or block) > > optStatus > - the variable used to track the status of ReceiverResultReg for > avoiding reloading that register with self between adjacent inst var > accesses > > picAbortTrampolines > - a CArrayAccessor of abort trampolines for 0, 1, 2 and N args > > picMissTrampolines > - a CArrayAccessor of abort trampolines for 0, 1, 2 and N args > > realCEEnterCogCodePopReceiverArg0Regs > realCEEnterCogCodePopReceiverArg1Arg0Regs > - the real trampolines for ebtering machine code with N reg args > when in the Debug regime > > regArgsHaveBeenPushed > - whether the register args have been pushed before frame build > (e.g. when an interpreter primitive is called) > > simSelf > - the simulation stack entry representing self in the current > compilation unit > > simSpillBase > - the variable tracking how much of the simulation stack has been > spilled to the real stack > > simStack > - the simulation stack itself > > simStackPtr > - the pointer to the top of the simulation stack > ! > StackToRegisterMappingCogit class > instanceVariableNames: 'numPushNilsFunction pushNilSizeFunction'! > > Item was changed: > ----- Method: StackToRegisterMappingCogit>>compileFrameBuild (in > category 'compile abstract instructions') ----- > compileFrameBuild > "Build a frame for a CogMethod activation. See CoInterpreter > class>>initializeFrameIndices. > Override to push the register receiver and register arguments, if > any." > + self cppIf: IMMUTABILITY ifTrue: > + [needsTwoPath ifTrue: > + [self compileTwoPathFrameBuild. > + ^self]]. > needsFrame ifFalse: > [self initSimStackForFramelessMethod: initialPC. > ^self]. > self genPushRegisterArgs. > super compileFrameBuild. > self initSimStackForFramefulMethod: initialPC! > > Item was added: > + ----- Method: StackToRegisterMappingCogit>>compileTwoPathFrameBuild (in > category 'compile abstract instructions') ----- > + compileTwoPathFrameBuild > + <option: #IMMUTABILITY> > + "We are in a method where the frame is needed *only* for instance > variable store, typically a setter method. > + This case has 20% overhead with Immutability compared to setter > without immutability because of the stack > + frame creation. We compile two path, one where the object is > immutable, one where it isn't. At the beginning > + of the frame build, we take one path or the other depending on the > receiver mutability. > + > + Note: this specific case happens only where there are only > instance variabel stores. We could do something > + similar for literal variable stores, but we don't as it's too > uncommon." > + |jumpImmutable| > + self assert: needsFrame. > + self assert: IMMUTABILITY. > + self assert: needsTwoPath. > + self assert: blockCount = 0. > + jumpImmutable := objectRepresentation genJumpImmutable: > ReceiverResultReg scratchReg: TempReg. > + "first path. The receiver is mutable" > + self initSimStackForFramelessMethod: initialPC. > + self compileMethodBody. > + "second path. The receiver is mutable" > + needsTwoPath := false. "reset because it impact inst var store > compilation" > + jumpImmutable jmpTarget: self Label. > + self genPushRegisterArgs. > + super compileFrameBuild. > + self initSimStackForFramefulMethod: initialPC! > > Item was changed: > ----- Method: > StackToRegisterMappingCogit>>genStorePop:slotIndex:destReg:needsStoreCheck:needsRestoreRcvr: > (in category 'bytecode generator support') ----- > genStorePop: popBoolean slotIndex: slotIndex destReg: destReg > needsStoreCheck: needsStoreCheck needsRestoreRcvr: needsRestoreReceiver > <inline: true> > "This method expects destReg to hold the object to store into. In > practice, it is almost always RcvrResultReg because it is mandatory for the > various store checks. We could put any register there if no store check is > needed" > self > cppIf: IMMUTABILITY > ifTrue: > + [needsTwoPath > + ifTrue: > + [self "first path, receiver is > mutable" > + genVanillaStorePop: > popBoolean > + slotIndex: slotIndex > + destReg: destReg > + needsStoreCheck: > needsStoreCheck] > + ifFalse: > + [self > + genImmCheckStorePop: > popBoolean > + slotIndex: slotIndex > + destReg: destReg > + needsStoreCheck: > needsStoreCheck > + needsRestoreRcvr: > needsRestoreReceiver]] > - [ self > - genImmCheckStorePop: popBoolean > - slotIndex: slotIndex > - destReg: destReg > - needsStoreCheck: needsStoreCheck > - needsRestoreRcvr: needsRestoreReceiver ] > ifFalse: > + [self > - [ self > genVanillaStorePop: popBoolean > slotIndex: slotIndex > destReg: destReg > + needsStoreCheck: needsStoreCheck]. > - needsStoreCheck: needsStoreCheck ]. > ! > > Item was changed: > ----- Method: StackToRegisterMappingCogit>>genUpArrowReturn (in category > 'bytecode generators') ----- > genUpArrowReturn > "Generate a method return from within a method or a block. > Frameless method activation looks like > CISCs (x86): > receiver > args > sp-> ret pc. > RISCs (ARM): > receiver > args > ret pc in LR. > A fully framed activation is described in CoInterpreter > class>initializeFrameIndices. > Return pops receiver and arguments off the stack. Callee pushes > the result." > + | framelessReturn | > deadCode := true. "can't fall through" > inBlock ifTrue: > [self assert: needsFrame. > self CallRT: ceNonLocalReturnTrampoline. > self annotateBytecode: self Label. > ^0]. > + self > + cppIf: IMMUTABILITY > + ifTrue: [framelessReturn := needsFrame and: [needsTwoPath > not]] > + ifFalse: [framelessReturn := needsFrame]. > + framelessReturn > - needsFrame > ifTrue: > [self MoveR: FPReg R: SPReg. > self PopR: FPReg. > backEnd hasLinkRegister ifTrue: > [self PopR: LinkReg]. > self RetN: methodOrBlockNumArgs + 1 * > objectMemory wordSize] > ifFalse: > [self RetN: ((methodOrBlockNumArgs > self > numRegArgs > "A method with an > interpreter prim will push its register args for the prim. If the failure > body is frameless the > args must still be popped, see e.g. Behavior>>nextInstance." > or: > [regArgsHaveBeenPushed]) > ifTrue: > [methodOrBlockNumArgs + 1 * objectMemory wordSize] > ifFalse: [0])]. > ^0! > > Item was changed: > ----- Method: StackToRegisterMappingCogit>>scanMethod (in category > 'compile abstract instructions') ----- > scanMethod > "Scan the method (and all embedded blocks) to determine > - what the last bytecode is; extra bytes at the end of a > method are used to encode things like source pointers or temp names > - if the method needs a frame or not > - what are the targets of any backward branches. > - how many blocks it creates > Answer the block count or on error a negative error code" > | latestContinuation nExts descriptor pc numBlocks distance > targetPC framelessStackDelta | > <var: #descriptor type: #'BytecodeDescriptor *'> > needsFrame := false. > prevBCDescriptor := nil. > + self cppIf: IMMUTABILITY ifTrue: [ needsTwoPath := false ]. > NewspeakVM ifTrue: > [numIRCs := 0]. > (primitiveIndex > 0 > and: [coInterpreter isQuickPrimitiveIndex: primitiveIndex]) > ifTrue: > [^0]. > pc := latestContinuation := initialPC. > numBlocks := framelessStackDelta := nExts := extA := extB := 0. > [pc <= endPC] whileTrue: > [byte0 := (objectMemory fetchByte: pc ofObject: methodObj) > + bytecodeSetOffset. > descriptor := self generatorAt: byte0. > descriptor isExtension ifTrue: > [descriptor opcode = Nop ifTrue: "unknown bytecode > tag; see Cogit class>>#generatorTableFrom:" > [^EncounteredUnknownBytecode]. > self loadSubsequentBytesForDescriptor: descriptor > at: pc. > self perform: descriptor generator]. > (descriptor isReturn > and: [pc >= latestContinuation]) ifTrue: > [endPC := pc]. > + self cppIf: IMMUTABILITY > + ifTrue: > + [(needsFrame and: [needsTwoPath not]) > ifFalse: > + [(descriptor needsFrameFunction > isNil > + or: [self perform: descriptor > needsFrameFunction with: framelessStackDelta]) > + ifTrue: > + [needsFrame := > true. > + needsTwoPath := > descriptor generator == #genStoreAndPopReceiverVariableBytecode ] > + ifFalse: > [framelessStackDelta := framelessStackDelta + descriptor stackDelta]]] > + ifFalse: > + [needsFrame ifFalse: > + [(descriptor needsFrameFunction > isNil > + or: [self perform: descriptor > needsFrameFunction with: framelessStackDelta]) > + ifTrue: [needsFrame := > true] > + ifFalse: > [framelessStackDelta := framelessStackDelta + descriptor stackDelta]]]. > + > - needsFrame ifFalse: > - [(descriptor needsFrameFunction isNil > - or: [self perform: descriptor needsFrameFunction > with: framelessStackDelta]) > - ifTrue: [needsFrame := true] > - ifFalse: [framelessStackDelta := > framelessStackDelta + descriptor stackDelta]]. > descriptor isBranch ifTrue: > [distance := self spanFor: descriptor at: pc exts: > nExts in: methodObj. > targetPC := pc + descriptor numBytes + distance. > (self isBackwardBranch: descriptor at: pc exts: > nExts in: methodObj) > ifTrue: [self initializeFixupAt: targetPC > - initialPC] > ifFalse: [latestContinuation := > latestContinuation max: targetPC]]. > descriptor isBlockCreation ifTrue: > [numBlocks := numBlocks + 1. > distance := self spanFor: descriptor at: pc exts: > nExts in: methodObj. > targetPC := pc + descriptor numBytes + distance. > latestContinuation := latestContinuation max: > targetPC]. > NewspeakVM ifTrue: > [descriptor hasIRC ifTrue: > [numIRCs := numIRCs + 1]]. > pc := pc + descriptor numBytes. > descriptor isExtension > ifTrue: [nExts := nExts + 1] > ifFalse: [nExts := extA := extB := 0]. > prevBCDescriptor := descriptor]. > ^numBlocks! > >

1 0

VM Maker: VMMaker.oscog-cb.1875.mcz
by commits＠source.squeak.org 27 May '16

27 May '16

ClementBera uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-cb.1875.mcz ==================== Summary ==================== Name: VMMaker.oscog-cb.1875 Author: cb Time: 27 May 2016, 11:43:40.369719 am UUID: 4da4e9c0-8ef3-4400-b610-73c7959006ce Ancestors: VMMaker.oscog-eem.1874 Anti-slavery society forms (NY)... When I benched Immutability/write barrier, games benchmarks had identical performance with and without it (the difference was within noise). However I built a microbench doing only inst var stores: Foo>>imm: imm nonImm: nonImm iv1 := 1. iv2 := #foo. iv3 := imm. iv4 := nonImm. | f | f := Foo new. [f imm: 2 nonImm: #bar ] bench And in this case there was 18.7% overhead with the write barrier. BinaryTree bench has a similar method, use it extensively and yet we can't see the overhead on the whole bench, so it's not that critical, but it's still something which could matter in specific cases. In this commit I changed the JIT so that (with Immutability/Write barrier ON) methods with only frameless instance variable stores are compiled with two paths. The code first checks if the receiver is immutable/read-only, and takes the right path accordingly. The first path is frameless and does not include immutability/write barrier checks. The second one is frameful and does all the immutability/write barrier checks. I didn't do it for blocks as I believe blocks with only instance variable store are not that common - I may be wrong, if you prove to me I am wrong on this with numbers, I will do it for blocks. In the micro-bench shown, #imm:nonImm:, the overhead decreased from 18.7% to 2.6%. I think this has an impact in general to setter methods. I made that in a Pharo sprint (or what it matters). =============== Diff against VMMaker.oscog-eem.1874 =============== Item was changed: ----- Method: RegisterAllocatingCogit>>scanMethod (in category 'compile abstract instructions') ----- scanMethod "Overrides to count the number of fixups." "Scan the method (and all embedded blocks) to determine - what the last bytecode is; extra bytes at the end of a method are used to encode things like source pointers or temp names - if the method needs a frame or not - what are the targets of any backward branches. - how many blocks it creates Answer the block count or on error a negative error code" | latestContinuation nExts descriptor pc numBlocks distance targetPC framelessStackDelta | <var: #descriptor type: #'BytecodeDescriptor *'> needsFrame := false. numFixups := 0. prevBCDescriptor := nil. + self + cppIf: IMMUTABILITY + ifTrue: [needsTwoPath := false]. NewspeakVM ifTrue: [numIRCs := 0]. (primitiveIndex > 0 and: [coInterpreter isQuickPrimitiveIndex: primitiveIndex]) ifTrue: [^0]. pc := latestContinuation := initialPC. numBlocks := framelessStackDelta := nExts := extA := extB := 0. [pc <= endPC] whileTrue: [byte0 := (objectMemory fetchByte: pc ofObject: methodObj) + bytecodeSetOffset. descriptor := self generatorAt: byte0. descriptor isExtension ifTrue: [descriptor opcode = Nop ifTrue: "unknown bytecode tag; see Cogit class>>#generatorTableFrom:" [^EncounteredUnknownBytecode]. self loadSubsequentBytesForDescriptor: descriptor at: pc. self perform: descriptor generator]. (descriptor isReturn and: [pc >= latestContinuation]) ifTrue: [endPC := pc]. + self + cppIf: IMMUTABILITY + ifTrue: [(needsFrame and: [needsTwoPath not]) + ifFalse: [(descriptor needsFrameFunction isNil + or: [self perform: descriptor needsFrameFunction with: framelessStackDelta]) + ifTrue: [needsFrame := true. + needsTwoPath := descriptor generator == #genStoreAndPopReceiverVariableBytecode] + ifFalse: [framelessStackDelta := framelessStackDelta + descriptor stackDelta]]] + ifFalse: [needsFrame + ifFalse: [(descriptor needsFrameFunction isNil + or: [self perform: descriptor needsFrameFunction with: framelessStackDelta]) + ifTrue: [needsFrame := true] + ifFalse: [framelessStackDelta := framelessStackDelta + descriptor stackDelta]]]. - needsFrame ifFalse: - [(descriptor needsFrameFunction isNil - or: [self perform: descriptor needsFrameFunction with: framelessStackDelta]) - ifTrue: [needsFrame := true] - ifFalse: [framelessStackDelta := framelessStackDelta + descriptor stackDelta]]. descriptor isBranch ifTrue: [distance := self spanFor: descriptor at: pc exts: nExts in: methodObj. targetPC := pc + descriptor numBytes + distance. (self isBackwardBranch: descriptor at: pc exts: nExts in: methodObj) ifTrue: [self initializeFixupAt: targetPC - initialPC] ifFalse: [latestContinuation := latestContinuation max: targetPC. numFixups := numFixups + 1]]. descriptor isBlockCreation ifTrue: [numBlocks := numBlocks + 1. distance := self spanFor: descriptor at: pc exts: nExts in: methodObj. targetPC := pc + descriptor numBytes + distance. latestContinuation := latestContinuation max: targetPC. numFixups := numFixups + 1]. NewspeakVM ifTrue: [descriptor hasIRC ifTrue: [numIRCs := numIRCs + 1]]. pc := pc + descriptor numBytes. descriptor isExtension ifTrue: [nExts := nExts + 1] ifFalse: [nExts := extA := extB := 0]. prevBCDescriptor := descriptor]. ^numBlocks! Item was changed: ----- Method: SistaCogit>>scanMethod (in category 'compile abstract instructions') ----- scanMethod "Scan the method (and all embedded blocks) to determine - what the last bytecode is; extra bytes at the end of a method are used to encode things like source pointers or temp names - if the method needs a frame or not - what are the targets of any backward branches. - how many blocks it creates - how many counters it needs/conditional branches it contains Answer the block count or on error a negative error code" | latestContinuation nExts descriptor pc numBlocks distance targetPC framelessStackDelta numFixups | <var: #descriptor type: #'BytecodeDescriptor *'> self flag: 'numFixup should be reverted to inst var when moving back sistaCogit as subclass of RegisterAllocatingCogit'. needsFrame := false. numFixups := 0. prevBCDescriptor := nil. numCounters := 0. + self + cppIf: IMMUTABILITY + ifTrue: [needsTwoPath := false]. NewspeakVM ifTrue: [numIRCs := 0]. (primitiveIndex > 0 and: [coInterpreter isQuickPrimitiveIndex: primitiveIndex]) ifTrue: [^0]. pc := latestContinuation := initialPC. numBlocks := framelessStackDelta := nExts := extA := extB := 0. [pc <= endPC] whileTrue: [byte0 := (objectMemory fetchByte: pc ofObject: methodObj) + bytecodeSetOffset. descriptor := self generatorAt: byte0. descriptor isExtension ifTrue: [descriptor opcode = Nop ifTrue: "unknown bytecode tag; see Cogit class>>#generatorTableFrom:" [^EncounteredUnknownBytecode]. self loadSubsequentBytesForDescriptor: descriptor at: pc. self perform: descriptor generator]. (descriptor isReturn and: [pc >= latestContinuation]) ifTrue: [endPC := pc]. + self + cppIf: IMMUTABILITY + ifTrue: [(needsFrame and: [needsTwoPath not]) + ifFalse: [(descriptor needsFrameFunction isNil + or: [self perform: descriptor needsFrameFunction with: framelessStackDelta]) + ifTrue: [needsFrame := true. + needsTwoPath := descriptor generator == #genStoreAndPopReceiverVariableBytecode] + ifFalse: [framelessStackDelta := framelessStackDelta + descriptor stackDelta]]] + ifFalse: [needsFrame + ifFalse: [(descriptor needsFrameFunction isNil + or: [self perform: descriptor needsFrameFunction with: framelessStackDelta]) + ifTrue: [needsFrame := true] + ifFalse: [framelessStackDelta := framelessStackDelta + descriptor stackDelta]]]. - needsFrame ifFalse: - [(descriptor needsFrameFunction isNil - or: [self perform: descriptor needsFrameFunction with: framelessStackDelta]) - ifTrue: [needsFrame := true] - ifFalse: [framelessStackDelta := framelessStackDelta + descriptor stackDelta]]. descriptor isBranch ifTrue: [distance := self spanFor: descriptor at: pc exts: nExts in: methodObj. targetPC := pc + descriptor numBytes + distance. (self isBackwardBranch: descriptor at: pc exts: nExts in: methodObj) ifTrue: [self initializeFixupAt: targetPC - initialPC] ifFalse: [latestContinuation := latestContinuation max: targetPC. numFixups := numFixups + 1. (descriptor isBranchTrue or: [descriptor isBranchFalse]) ifTrue: [numCounters := numCounters + 1]]]. descriptor isBlockCreation ifTrue: [numBlocks := numBlocks + 1. distance := self spanFor: descriptor at: pc exts: nExts in: methodObj. targetPC := pc + descriptor numBytes + distance. latestContinuation := latestContinuation max: targetPC. numFixups := numFixups + 1]. NewspeakVM ifTrue: [descriptor hasIRC ifTrue: [numIRCs := numIRCs + 1]]. pc := pc + descriptor numBytes. descriptor isExtension ifTrue: [nExts := nExts + 1] ifFalse: [nExts := extA := extB := 0]. prevBCDescriptor := descriptor]. ^numBlocks! Item was changed: SimpleStackBasedCogit subclass: #StackToRegisterMappingCogit + instanceVariableNames: 'prevBCDescriptor numPushNilsFunction pushNilSizeFunction methodOrBlockNumTemps regArgsHaveBeenPushed simSelf simStack simStackPtr simSpillBase optStatus ceCallCogCodePopReceiverArg0Regs ceCallCogCodePopReceiverArg1Arg0Regs methodAbortTrampolines picAbortTrampolines picMissTrampolines ceCall0ArgsPIC ceCall1ArgsPIC ceCall2ArgsPIC debugStackPointers debugFixupBreaks realCECallCogCodePopReceiverArg0Regs realCECallCogCodePopReceiverArg1Arg0Regs deadCode needsTwoPath' - instanceVariableNames: 'prevBCDescriptor numPushNilsFunction pushNilSizeFunction methodOrBlockNumTemps regArgsHaveBeenPushed simSelf simStack simStackPtr simSpillBase optStatus ceCallCogCodePopReceiverArg0Regs ceCallCogCodePopReceiverArg1Arg0Regs methodAbortTrampolines picAbortTrampolines picMissTrampolines ceCall0ArgsPIC ceCall1ArgsPIC ceCall2ArgsPIC debugStackPointers debugFixupBreaks realCECallCogCodePopReceiverArg0Regs realCECallCogCodePopReceiverArg1Arg0Regs deadCode' classVariableNames: 'NeedsMergeFixupFlag NeedsNonMergeFixupFlag' poolDictionaries: 'CogCompilationConstants VMMethodCacheConstants VMObjectIndices VMStackFrameOffsets' category: 'VMMaker-JIT'! StackToRegisterMappingCogit class instanceVariableNames: 'numPushNilsFunction pushNilSizeFunction'! !StackToRegisterMappingCogit commentStamp: 'eem 12/19/2010 18:12' prior: 0! StackToRegisterMappingCogit is an optimizing code generator that eliminates a lot of stack operations and inlines some special selector arithmetic. It does so by a simple stack-to-register mapping scheme based on deferring the generation of code to produce operands until operand-consuming operations. The operations that consume operands are sends, stores and returns. See methods in the class-side documentation protocol for more detail. Instance Variables callerSavedRegMask: <Integer> ceEnter0ArgsPIC: <Integer> ceEnter1ArgsPIC: <Integer> ceEnter2ArgsPIC: <Integer> ceEnterCogCodePopReceiverArg0Regs: <Integer> ceEnterCogCodePopReceiverArg1Arg0Regs: <Integer> debugBytecodePointers: <Set of Integer> debugFixupBreaks: <Set of Integer> debugStackPointers: <CArrayAccessor of (Integer|nil)> methodAbortTrampolines: <CArrayAccessor of Integer> methodOrBlockNumTemps: <Integer> optStatus: <Integer> picAbortTrampolines: <CArrayAccessor of Integer> picMissTrampolines: <CArrayAccessor of Integer> realCEEnterCogCodePopReceiverArg0Regs: <Integer> realCEEnterCogCodePopReceiverArg1Arg0Regs: <Integer> regArgsHaveBeenPushed: <Boolean> simSelf: <CogSimStackEntry> simSpillBase: <Integer> simStack: <CArrayAccessor of CogSimStackEntry> simStackPtr: <Integer> traceSimStack: <Integer> callerSavedRegMask - the bitmask of the ABI's caller-saved registers ceEnter0ArgsPIC ceEnter1ArgsPIC ceEnter2ArgsPIC - the trampoline for entering an N-arg PIC ceEnterCogCodePopReceiverArg0Regs ceEnterCogCodePopReceiverArg1Arg0Regs - teh trampoline for entering a method with N register args debugBytecodePointers - a Set of bytecode pcs for setting breakpoints (simulation only) debugFixupBreaks - a Set of fixup indices for setting breakpoints (simulation only) debugStackPointers - an Array of stack depths for each bytecode for code verification methodAbortTrampolines - a CArrayAccessor of abort trampolines for 0, 1, 2 and N args methodOrBlockNumTemps - the number of method or block temps (including args) in the current compilation unit (method or block) optStatus - the variable used to track the status of ReceiverResultReg for avoiding reloading that register with self between adjacent inst var accesses picAbortTrampolines - a CArrayAccessor of abort trampolines for 0, 1, 2 and N args picMissTrampolines - a CArrayAccessor of abort trampolines for 0, 1, 2 and N args realCEEnterCogCodePopReceiverArg0Regs realCEEnterCogCodePopReceiverArg1Arg0Regs - the real trampolines for ebtering machine code with N reg args when in the Debug regime regArgsHaveBeenPushed - whether the register args have been pushed before frame build (e.g. when an interpreter primitive is called) simSelf - the simulation stack entry representing self in the current compilation unit simSpillBase - the variable tracking how much of the simulation stack has been spilled to the real stack simStack - the simulation stack itself simStackPtr - the pointer to the top of the simulation stack ! StackToRegisterMappingCogit class instanceVariableNames: 'numPushNilsFunction pushNilSizeFunction'! Item was changed: ----- Method: StackToRegisterMappingCogit>>compileFrameBuild (in category 'compile abstract instructions') ----- compileFrameBuild "Build a frame for a CogMethod activation. See CoInterpreter class>>initializeFrameIndices. Override to push the register receiver and register arguments, if any." + self cppIf: IMMUTABILITY ifTrue: + [needsTwoPath ifTrue: + [self compileTwoPathFrameBuild. + ^self]]. needsFrame ifFalse: [self initSimStackForFramelessMethod: initialPC. ^self]. self genPushRegisterArgs. super compileFrameBuild. self initSimStackForFramefulMethod: initialPC! Item was added: + ----- Method: StackToRegisterMappingCogit>>compileTwoPathFrameBuild (in category 'compile abstract instructions') ----- + compileTwoPathFrameBuild + <option: #IMMUTABILITY> + "We are in a method where the frame is needed *only* for instance variable store, typically a setter method. + This case has 20% overhead with Immutability compared to setter without immutability because of the stack + frame creation. We compile two path, one where the object is immutable, one where it isn't. At the beginning + of the frame build, we take one path or the other depending on the receiver mutability. + + Note: this specific case happens only where there are only instance variabel stores. We could do something + similar for literal variable stores, but we don't as it's too uncommon." + |jumpImmutable| + self assert: needsFrame. + self assert: IMMUTABILITY. + self assert: needsTwoPath. + self assert: blockCount = 0. + jumpImmutable := objectRepresentation genJumpImmutable: ReceiverResultReg scratchReg: TempReg. + "first path. The receiver is mutable" + self initSimStackForFramelessMethod: initialPC. + self compileMethodBody. + "second path. The receiver is mutable" + needsTwoPath := false. "reset because it impact inst var store compilation" + jumpImmutable jmpTarget: self Label. + self genPushRegisterArgs. + super compileFrameBuild. + self initSimStackForFramefulMethod: initialPC! Item was changed: ----- Method: StackToRegisterMappingCogit>>genStorePop:slotIndex:destReg:needsStoreCheck:needsRestoreRcvr: (in category 'bytecode generator support') ----- genStorePop: popBoolean slotIndex: slotIndex destReg: destReg needsStoreCheck: needsStoreCheck needsRestoreRcvr: needsRestoreReceiver <inline: true> "This method expects destReg to hold the object to store into. In practice, it is almost always RcvrResultReg because it is mandatory for the various store checks. We could put any register there if no store check is needed" self cppIf: IMMUTABILITY ifTrue: + [needsTwoPath + ifTrue: + [self "first path, receiver is mutable" + genVanillaStorePop: popBoolean + slotIndex: slotIndex + destReg: destReg + needsStoreCheck: needsStoreCheck] + ifFalse: + [self + genImmCheckStorePop: popBoolean + slotIndex: slotIndex + destReg: destReg + needsStoreCheck: needsStoreCheck + needsRestoreRcvr: needsRestoreReceiver]] - [ self - genImmCheckStorePop: popBoolean - slotIndex: slotIndex - destReg: destReg - needsStoreCheck: needsStoreCheck - needsRestoreRcvr: needsRestoreReceiver ] ifFalse: + [self - [ self genVanillaStorePop: popBoolean slotIndex: slotIndex destReg: destReg + needsStoreCheck: needsStoreCheck]. - needsStoreCheck: needsStoreCheck ]. ! Item was changed: ----- Method: StackToRegisterMappingCogit>>genUpArrowReturn (in category 'bytecode generators') ----- genUpArrowReturn "Generate a method return from within a method or a block. Frameless method activation looks like CISCs (x86): receiver args sp-> ret pc. RISCs (ARM): receiver args ret pc in LR. A fully framed activation is described in CoInterpreter class>initializeFrameIndices. Return pops receiver and arguments off the stack. Callee pushes the result." + | framelessReturn | deadCode := true. "can't fall through" inBlock ifTrue: [self assert: needsFrame. self CallRT: ceNonLocalReturnTrampoline. self annotateBytecode: self Label. ^0]. + self + cppIf: IMMUTABILITY + ifTrue: [framelessReturn := needsFrame and: [needsTwoPath not]] + ifFalse: [framelessReturn := needsFrame]. + framelessReturn - needsFrame ifTrue: [self MoveR: FPReg R: SPReg. self PopR: FPReg. backEnd hasLinkRegister ifTrue: [self PopR: LinkReg]. self RetN: methodOrBlockNumArgs + 1 * objectMemory wordSize] ifFalse: [self RetN: ((methodOrBlockNumArgs > self numRegArgs "A method with an interpreter prim will push its register args for the prim. If the failure body is frameless the args must still be popped, see e.g. Behavior>>nextInstance." or: [regArgsHaveBeenPushed]) ifTrue: [methodOrBlockNumArgs + 1 * objectMemory wordSize] ifFalse: [0])]. ^0! Item was changed: ----- Method: StackToRegisterMappingCogit>>scanMethod (in category 'compile abstract instructions') ----- scanMethod "Scan the method (and all embedded blocks) to determine - what the last bytecode is; extra bytes at the end of a method are used to encode things like source pointers or temp names - if the method needs a frame or not - what are the targets of any backward branches. - how many blocks it creates Answer the block count or on error a negative error code" | latestContinuation nExts descriptor pc numBlocks distance targetPC framelessStackDelta | <var: #descriptor type: #'BytecodeDescriptor *'> needsFrame := false. prevBCDescriptor := nil. + self cppIf: IMMUTABILITY ifTrue: [ needsTwoPath := false ]. NewspeakVM ifTrue: [numIRCs := 0]. (primitiveIndex > 0 and: [coInterpreter isQuickPrimitiveIndex: primitiveIndex]) ifTrue: [^0]. pc := latestContinuation := initialPC. numBlocks := framelessStackDelta := nExts := extA := extB := 0. [pc <= endPC] whileTrue: [byte0 := (objectMemory fetchByte: pc ofObject: methodObj) + bytecodeSetOffset. descriptor := self generatorAt: byte0. descriptor isExtension ifTrue: [descriptor opcode = Nop ifTrue: "unknown bytecode tag; see Cogit class>>#generatorTableFrom:" [^EncounteredUnknownBytecode]. self loadSubsequentBytesForDescriptor: descriptor at: pc. self perform: descriptor generator]. (descriptor isReturn and: [pc >= latestContinuation]) ifTrue: [endPC := pc]. + self cppIf: IMMUTABILITY + ifTrue: + [(needsFrame and: [needsTwoPath not]) ifFalse: + [(descriptor needsFrameFunction isNil + or: [self perform: descriptor needsFrameFunction with: framelessStackDelta]) + ifTrue: + [needsFrame := true. + needsTwoPath := descriptor generator == #genStoreAndPopReceiverVariableBytecode ] + ifFalse: [framelessStackDelta := framelessStackDelta + descriptor stackDelta]]] + ifFalse: + [needsFrame ifFalse: + [(descriptor needsFrameFunction isNil + or: [self perform: descriptor needsFrameFunction with: framelessStackDelta]) + ifTrue: [needsFrame := true] + ifFalse: [framelessStackDelta := framelessStackDelta + descriptor stackDelta]]]. + - needsFrame ifFalse: - [(descriptor needsFrameFunction isNil - or: [self perform: descriptor needsFrameFunction with: framelessStackDelta]) - ifTrue: [needsFrame := true] - ifFalse: [framelessStackDelta := framelessStackDelta + descriptor stackDelta]]. descriptor isBranch ifTrue: [distance := self spanFor: descriptor at: pc exts: nExts in: methodObj. targetPC := pc + descriptor numBytes + distance. (self isBackwardBranch: descriptor at: pc exts: nExts in: methodObj) ifTrue: [self initializeFixupAt: targetPC - initialPC] ifFalse: [latestContinuation := latestContinuation max: targetPC]]. descriptor isBlockCreation ifTrue: [numBlocks := numBlocks + 1. distance := self spanFor: descriptor at: pc exts: nExts in: methodObj. targetPC := pc + descriptor numBytes + distance. latestContinuation := latestContinuation max: targetPC]. NewspeakVM ifTrue: [descriptor hasIRC ifTrue: [numIRCs := numIRCs + 1]]. pc := pc + descriptor numBytes. descriptor isExtension ifTrue: [nExts := nExts + 1] ifFalse: [nExts := extA := extB := 0]. prevBCDescriptor := descriptor]. ^numBlocks!

1 0

VM Maker: VMMaker.oscog-eem.1874.mcz
by commits＠source.squeak.org 27 May '16

27 May '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1874.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1874 Author: eem Time: 26 May 2016, 4:56:42.490161 pm UUID: 99326b2f-4a6d-48e1-9fa7-a2f841763f56 Ancestors: VMMaker.oscog-eem.1873 Cogit: Fix some compilation warnings in cogitX64.c =============== Diff against VMMaker.oscog-eem.1873 =============== Item was changed: ----- Method: Cogit class>>declareCVarsIn: (in category 'translation') ----- declareCVarsIn: aCCodeGenerator #( 'coInterpreter' 'objectMemory' 'methodZone' 'objectRepresentation' 'cogBlockMethodSurrogateClass' 'cogMethodSurrogateClass' 'nsSendCacheSurrogateClass' 'threadManager' 'processor' 'lastNInstructions' 'simulatedAddresses' 'simulatedTrampolines' 'simulatedVariableGetters' 'simulatedVariableSetters' 'printRegisters' 'printInstructions' 'clickConfirm' 'singleStep') do: [:simulationVariableNotNeededForRealVM| aCCodeGenerator removeVariable: simulationVariableNotNeededForRealVM]. NewspeakVM ifFalse: [#( 'selfSendTrampolines' 'dynamicSuperSendTrampolines' 'implicitReceiverSendTrampolines' 'outerSendTrampolines' 'ceEnclosingObjectTrampoline' 'numIRCs' 'indexOfIRC' 'theIRCs') do: [:variableNotNeededInNormalVM| aCCodeGenerator removeVariable: variableNotNeededInNormalVM]]. aCCodeGenerator removeConstant: #COGMTVM. "this should be defined at compile time" aCCodeGenerator addHeaderFile:'<stddef.h>'; "for e.g. offsetof" addHeaderFile:'"sqCogStackAlignment.h"'; addHeaderFile:'"dispdbg.h"'; "must precede cointerp.h & cogit.h otherwise NoDbgRegParms gets screwed up" addHeaderFile:'"cogmethod.h"'. NewspeakVM ifTrue: [aCCodeGenerator addHeaderFile:'"nssendcache.h"']. aCCodeGenerator addHeaderFile:'#if COGMTVM'; addHeaderFile:'"cointerpmt.h"'; addHeaderFile:'#else'; addHeaderFile:'"cointerp.h"'; addHeaderFile:'#endif'; addHeaderFile:'"cogit.h"'. aCCodeGenerator var: #ceGetFP declareC: 'unsigned long (*ceGetFP)(void)'; var: #ceGetSP declareC: 'unsigned long (*ceGetSP)(void)'; var: #ceCaptureCStackPointers declareC: 'void (*ceCaptureCStackPointers)(void)'; var: #ceEnterCogCodePopReceiverReg declareC: 'void (*ceEnterCogCodePopReceiverReg)(void)'; var: #realCEEnterCogCodePopReceiverReg declareC: 'void (*realCEEnterCogCodePopReceiverReg)(void)'; var: #ceCallCogCodePopReceiverReg declareC: 'void (*ceCallCogCodePopReceiverReg)(void)'; var: #realCECallCogCodePopReceiverReg declareC: 'void (*realCECallCogCodePopReceiverReg)(void)'; var: #ceCallCogCodePopReceiverAndClassRegs declareC: 'void (*ceCallCogCodePopReceiverAndClassRegs)(void)'; var: #realCECallCogCodePopReceiverAndClassRegs declareC: 'void (*realCECallCogCodePopReceiverAndClassRegs)(void)'; var: #ceFlushICache declareC: 'static void (*ceFlushICache)(unsigned long from, unsigned long to)'; var: #ceCheckFeaturesFunction declareC: 'static unsigned long (*ceCheckFeaturesFunction)(void)'; var: #ceTryLockVMOwner declareC: 'unsigned long (*ceTryLockVMOwner)(void)'; var: #ceUnlockVMOwner declareC: 'void (*ceUnlockVMOwner)(void)'; var: #postCompileHook declareC: 'void (*postCompileHook)(CogMethod *)'; var: #openPICList declareC: 'CogMethod *openPICList = 0'; var: #maxMethodBefore type: #'CogBlockMethod *'. + self objectMemoryClass wordSize = 8 ifTrue: + [aCCodeGenerator var: 'enumeratingCogMethod' type: #'CogMethod *']. aCCodeGenerator declareVar: 'aMethodLabel' type: #'AbstractInstruction'; "Has to come lexicographically before backEnd & methodLabel" var: #backEnd declareC: 'AbstractInstruction * const backEnd = &aMethodLabel'; var: #methodLabel declareC: 'AbstractInstruction * const methodLabel = &aMethodLabel'. self declareC: #(abstractOpcodes stackCheckLabel blockEntryLabel blockEntryNoContextSwitch stackOverflowCall sendMiss entry noCheckEntry selfSendEntry dynSuperEntry fullBlockNoContextSwitchEntry fullBlockEntry picMNUAbort picInterpretAbort endCPICCase0 endCPICCase1 cPICEndOfCodeLabel) as: #'AbstractInstruction *' in: aCCodeGenerator. aCCodeGenerator declareVar: #blockStarts type: #'BlockStart *'; declareVar: #fixups type: #'BytecodeFixup *'. aCCodeGenerator var: #ordinarySendTrampolines declareC: 'sqInt ordinarySendTrampolines[NumSendTrampolines]'; var: #superSendTrampolines declareC: 'sqInt superSendTrampolines[NumSendTrampolines]'; var: #directedSuperSendTrampolines declareC: 'sqInt directedSuperSendTrampolines[NumSendTrampolines]'; var: #selfSendTrampolines declareC: 'sqInt selfSendTrampolines[NumSendTrampolines]'; var: #dynamicSuperSendTrampolines declareC: 'sqInt dynamicSuperSendTrampolines[NumSendTrampolines]'; var: #implicitReceiverSendTrampolines declareC: 'sqInt implicitReceiverSendTrampolines[NumSendTrampolines]'; var: #outerSendTrampolines declareC: 'sqInt outerSendTrampolines[NumSendTrampolines]'; var: #trampolineAddresses declareC: 'static char *trampolineAddresses[NumTrampolines*2]'; var: #objectReferencesInRuntime declareC: 'static usqInt objectReferencesInRuntime[NumObjRefsInRuntime]'; var: #labelCounter type: #int; var: #traceFlags declareC: 'int traceFlags = 8 /* prim trace log on by default */'; var: #cStackAlignment declareC: 'const int cStackAlignment = STACK_ALIGN_BYTES'. aCCodeGenerator declareVar: #CFramePointer type: #'void *'; declareVar: #CStackPointer type: #'void *'; declareVar: #minValidCallAddress type: #'unsigned long'; declareVar: #debugPrimCallStackOffset type: #'unsigned long'. aCCodeGenerator vmClass generatorTable ifNotNil: [:bytecodeGenTable| aCCodeGenerator var: #generatorTable declareC: 'static BytecodeDescriptor generatorTable[', bytecodeGenTable size, ']', (self tableInitializerFor: bytecodeGenTable in: aCCodeGenerator)]. "In C the abstract opcode names clash with the Smalltak generator syntactic sugar. Most of the syntactic sugar is inlined, but alas some remains. Rename the syntactic sugar to avoid the clash." (self organization listAtCategoryNamed: #'abstract instructions') do: [:s| aCCodeGenerator addSelectorTranslation: s to: 'g', (aCCodeGenerator cFunctionNameFor: s)]. aCCodeGenerator addSelectorTranslation: #halt: to: 'haltmsg'! Item was changed: ----- Method: Cogit>>addressIsInInstructions: (in category 'testing') ----- addressIsInInstructions: address <var: #address type: #'AbstractInstruction *'> + ^self cCode: '!!((usqInt)(address) & BytesPerWord-1) \ - ^self cCode: '!!((unsigned)(address) & BytesPerWord-1) \ && (address) >= &abstractOpcodes[0] \ && (address) < &abstractOpcodes[opcodeIndex]' inSmalltalk: [(abstractOpcodes object identityIndexOf: address) between: 1 and: opcodeIndex]! Item was changed: ----- Method: Cogit>>noTargetsFreeInClosedPIC: (in category 'compaction') ----- noTargetsFreeInClosedPIC: cPIC "Answer if all targets in the PIC are in-use methods." + <var: #cPIC type: #'CogMethod *'> ^(self cPICHasFreedTargets: cPIC) not!

1 0

[commit][3732] CogVM source as per VMMaker.oscog-eem.1873
by commits＠squeakvm.org 26 May '16

26 May '16

Revision: 3732 Author: eliot Date: 2016-05-26 13:01:37 -0700 (Thu, 26 May 2016) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1873 Spur: Fix ephemerons (at least for Gule's test case). The mournQueue is of course a root for the scavenger and so must be visited at the start of a scavenge. Fix bug in markAllUnscannedEphemerons, enumerating correctly. Both fireEphemeronsInRememberedSet and fireEphemeronsOnEphemeronList must check for an ephemeron being fireable. An as-yet-firable ephemeron might get added to the ephemeron list and later its key may get tenured, rendering the ephemeron unfirable in that cycle. Fix marking of obj stack contents (markAndTraceObjStack:andContents:). Again tenuring could cause contents to be forwarded and hence read barrier is needed. Fix asserts that check for ephemerons so that the change in an ephemeron's format once it gets added to the mournQueue doesn't break the asserts; isMaybeFiredEphemeron[Format]: answer true for ephemerons and ephemerons in the mournQueue. Make pushLiteralVariable: store unfollowed literals back into the literal frame. Do so in a function off to the side, not inlined into the interpreter loop. With these changes Guille's test case passes: | e | Smalltalk supportsQueueingFinalization: true. e := (1 to: 200000) collect: [:i| Ephemeron key: (ObjectFinalizer receiver: 'test', 'asd' selector: #logCr) value: Object new]. Smalltalk garbageCollect! Plugins: Take a slightly more minimal approach to Esteban's FloatArray changes in VMMaker.oscog-EstebanLorenzano.1869 Modified Paths: -------------- branches/Cog/nsspur64src/vm/cogit.h branches/Cog/nsspur64src/vm/cointerp.c branches/Cog/nsspur64src/vm/cointerp.h branches/Cog/nsspur64src/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspurstack64src/vm/gcc3x-interp.c branches/Cog/nsspurstack64src/vm/interp.c branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/spur64src/vm/cogit.h branches/Cog/spur64src/vm/cointerp.c branches/Cog/spur64src/vm/cointerp.h branches/Cog/spur64src/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spurstack64src/vm/gcc3x-interp.c branches/Cog/spurstack64src/vm/interp.c branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nsspur64src/vm/cogit.h =================================================================== --- branches/Cog/nsspur64src/vm/cogit.h 2016-05-25 23:56:00 UTC (rev 3731) +++ branches/Cog/nsspur64src/vm/cogit.h 2016-05-26 20:01:37 UTC (rev 3732) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1865 uuid: 2aa4b0e0-004d-4599-896a-084a749a2c47 + CCodeGenerator VMMaker.oscog-eem.1872 uuid: 6db6d610-b1a5-4f4d-978d-22c917bdb3e4 */ Modified: branches/Cog/nsspur64src/vm/cointerp.c =================================================================== --- branches/Cog/nsspur64src/vm/cointerp.c 2016-05-25 23:56:00 UTC (rev 3731) +++ branches/Cog/nsspur64src/vm/cointerp.c 2016-05-26 20:01:37 UTC (rev 3732) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1865 uuid: 2aa4b0e0-004d-4599-896a-084a749a2c47 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1872 uuid: 6db6d610-b1a5-4f4d-978d-22c917bdb3e4 from - CoInterpreter VMMaker.oscog-eem.1865 uuid: 2aa4b0e0-004d-4599-896a-084a749a2c47 + CoInterpreter VMMaker.oscog-eem.1872 uuid: 6db6d610-b1a5-4f4d-978d-22c917bdb3e4 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1865 uuid: 2aa4b0e0-004d-4599-896a-084a749a2c47 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1872 uuid: 6db6d610-b1a5-4f4d-978d-22c917bdb3e4 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -75,6 +75,9 @@ # define siglongjmp(jb,v) _longjmp(jb,v) #endif +#define odd(v) ((int)(v)&1) +#define even(v) (!odd(v)) + /* end StackInterpreter class>>preambleCCode */ @@ -913,6 +916,7 @@ static sqInt allNewSpaceObjectsHaveZeroRTRefCount(void); static sqInt allWeakSurvivorsOnWeakList(void); static void NeverInline computeRefCountToShrinkRT(void); +static sqInt NoDbgRegParms copyAndForwardMourner(sqInt mourner); static sqInt NoDbgRegParms copyAndForward(sqInt survivor); static sqInt NoDbgRegParms NeverInline copyToOldSpacebytesformat(sqInt survivor, sqInt bytesInObject, sqInt formatOfSurvivor); static usqInt NoDbgRegParms firstCorpse(sqInt headOfCorpseList); @@ -1104,7 +1108,9 @@ static sqInt NoDbgRegParms isInNewSpace(sqInt objOop); extern sqInt isInOldSpace(sqInt address); static sqInt NoDbgRegParms isInPastSpace(sqInt address); +static sqInt NoDbgRegParms isMaybeFiredEphemeron(sqInt objOop); extern sqInt isNonImmediate(sqInt oop); +static sqInt NoDbgRegParms isObjEphemeron(sqInt objOop); static sqInt NoDbgRegParms isObjImmutable(sqInt anOop); extern sqInt isOldObject(sqInt objOop); extern sqInt isOopCompiledMethod(sqInt oop); @@ -1151,6 +1157,7 @@ extern void longPrintInstancesOf(sqInt aClassOop); extern void longPrintInstancesWithClassIndex(sqInt classIndex); extern void longPrintReferencesTo(sqInt anOop); +static void NeverInline mapMournQueue(void); static sqInt NoDbgRegParms mapOopsFromtooutPointersoutHashes(sqInt segStart, sqInt segAddr, sqInt outPointerArray, sqInt savedOutHashes); static void NoDbgRegParms markAndTraceClassOf(sqInt objOop); static void NoDbgRegParms markAndTraceObjStackandContents(sqInt stackOrNil, sqInt markAndTraceContents); @@ -1561,6 +1568,7 @@ extern sqInt superclassOf(sqInt classPointer); extern sqInt tempCountOf(sqInt methodPointer); extern sqInt temporaryCountOfMethodHeader(sqInt header); +static sqInt NoDbgRegParms NeverInline unfollowatIndex(sqInt litVar, sqInt literalIndex); static sqInt NoDbgRegParms validInstructionPointerinFrame(usqInt anInstrPointer, char *fp); static sqInt validStackPageBaseFrames(void); static void NoDbgRegParms voidLongRunningPrimitive(char *reason); @@ -1661,9 +1669,10 @@ _iss usqInt oldSpaceStart; _iss sqLong nextProfileTick; _iss sqInt profileProcess; +_iss SpurNewSpaceSpace futureSpace; _iss sqInt numClassTablePages; _iss sqInt profileSemaphore; -_iss SpurNewSpaceSpace futureSpace; +_iss sqInt futureSurvivorStart; _iss sqInt profileMethod; _iss sqInt classTableIndex; _iss sqInt longRunningPrimitiveCheckSemaphore; @@ -1671,24 +1680,23 @@ _iss sqInt jmpDepth; _iss usqInt lastFreeChunk; _iss SpurNewSpaceSpace eden; +_iss sqInt mournQueue; _iss sqInt becomeEffectsFlags; -_iss sqInt futureSurvivorStart; _iss sqInt longRunningPrimitiveCheckMethod; _iss char * objStackInvalidBecause; -_iss sqInt tempOop2; _iss sqInt ephemeronList; +_iss sqInt tempOop2; +_iss sqInt tenureThreshold; _iss usqInt freeOldSpaceStart; _iss sqInt tempOop3; -_iss sqInt tenureThreshold; _iss sqInt extraRootCount; _iss sqInt growHeadroom; _iss sqInt invalidObjStackPage; -_iss sqInt mournQueue; _iss sqInt previousRememberedSetSize; +_iss sqInt tenureCriterion; _iss sqInt classNameIndex; _iss sqInt methodDictLinearSearchLimit; _iss sqInt pendingFinalizationSignals; -_iss sqInt tenureCriterion; _iss sqInt metaclassNumSlots; _iss sqInt numSegInfos; _iss sqInt preemptionYields; @@ -1708,6 +1716,7 @@ _iss sqInt weakList; _iss sqInt externalPrimitiveTableFirstFreeIndex; _iss sqInt marking; +_iss sqInt statSurvivorCount; _iss sqInt thisClassIndex; _iss sqInt firstSegmentSize; _iss usqLong gcStartUsecs; @@ -1722,7 +1731,6 @@ _iss usqInt memory; _iss sqInt numCompactionPasses; _iss sqInt scavengeInProgress; -_iss sqInt statSurvivorCount; _iss sqInt fullScreenFlag; _iss float heapGrowthToSizeGCRatio; _iss usqInt heapSizeAtPreviousGC; @@ -2444,7 +2452,7 @@ }; sqInt checkedPluginName; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1865"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1872"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -3606,7 +3614,6 @@ /* pushLiteralVariableBytecode */ { sqInt litVar; - sqInt referent; VM_LABEL(pushLiteralVariableBytecode); /* begin fetchNextBytecode */ @@ -3622,14 +3629,7 @@ assert(GIV(method) == (iframeMethod(localFP))); litVar = longAt((GIV(method) + BaseHeaderSize) + 8 /* ((currentBytecode bitAnd: 31) + LiteralStart) << self shiftForWord */); if (((longAt(litVar)) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) { - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(litVar)); - referent = longAt((litVar + BaseHeaderSize)); - while (((referent & (tagMask())) == 0) - && (((longAt(referent)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { - referent = longAt((referent + BaseHeaderSize)); - } - litVar = referent; + litVar = unfollowatIndex(litVar, 0 /* currentBytecode bitAnd: 31 */); } /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((litVar + BaseHeaderSize) + 8 /* ValueIndex << self shiftForWord */)); @@ -3641,7 +3641,6 @@ /* pushLiteralVariableBytecode */ { sqInt litVar; - sqInt referent; VM_LABEL(pushLiteralVariableBytecode1); /* begin fetchNextBytecode */ @@ -3657,14 +3656,7 @@ assert(GIV(method) == (iframeMethod(localFP))); litVar = longAt((GIV(method) + BaseHeaderSize) + 16 /* ((currentBytecode bitAnd: 31) + LiteralStart) << self shiftForWord */); if (((longAt(litVar)) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) { - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(litVar)); - referent = longAt((litVar + BaseHeaderSize)); - while (((referent & (tagMask())) == 0) - && (((longAt(referent)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { - referent = longAt((referent + BaseHeaderSize)); - } - litVar = referent; + litVar = unfollowatIndex(litVar, 1 /* currentBytecode bitAnd: 31 */); } /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((litVar + BaseHeaderSize) + 8 /* ValueIndex << self shiftForWord */)); @@ -3676,7 +3668,6 @@ /* pushLiteralVariableBytecode */ { sqInt litVar; - sqInt referent; VM_LABEL(pushLiteralVariableBytecode2); /* begin fetchNextBytecode */ @@ -3692,14 +3683,7 @@ assert(GIV(method) == (iframeMethod(localFP))); litVar = longAt((GIV(method) + BaseHeaderSize) + 24 /* ((currentBytecode bitAnd: 31) + LiteralStart) << self shiftForWord */); if (((longAt(litVar)) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) { - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(litVar)); - referent = longAt((litVar + BaseHeaderSize)); - while (((referent & (tagMask())) == 0) - && (((longAt(referent)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { - referent = longAt((referent + BaseHeaderSize)); - } - litVar = referent; + litVar = unfollowatIndex(litVar, 2 /* currentBytecode bitAnd: 31 */); } /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((litVar + BaseHeaderSize) + 8 /* ValueIndex << self shiftForWord */)); @@ -3711,7 +3695,6 @@ /* pushLiteralVariableBytecode */ { sqInt litVar; - sqInt referent; VM_LABEL(pushLiteralVariableBytecode3); /* begin fetchNextBytecode */ @@ -3727,14 +3710,7 @@ assert(GIV(method) == (iframeMethod(localFP))); litVar = longAt((GIV(method) + BaseHeaderSize) + 32 /* ((currentBytecode bitAnd: 31) + LiteralStart) << self shiftForWord */); if (((longAt(litVar)) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) { - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(litVar)); - referent = longAt((litVar + BaseHeaderSize)); - while (((referent & (tagMask())) == 0) - && (((longAt(referent)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { - referent = longAt((referent + BaseHeaderSize)); - } - litVar = referent; + litVar = unfollowatIndex(litVar, 3 /* currentBytecode bitAnd: 31 */); } /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((litVar + BaseHeaderSize) + 8 /* ValueIndex << self shiftForWord */)); @@ -3746,7 +3722,6 @@ /* pushLiteralVariableBytecode */ { sqInt litVar; - sqInt referent; VM_LABEL(pushLiteralVariableBytecode4); /* begin fetchNextBytecode */ @@ -3762,14 +3737,7 @@ assert(GIV(method) == (iframeMethod(localFP))); litVar = longAt((GIV(method) + BaseHeaderSize) + 40 /* ((currentBytecode bitAnd: 31) + LiteralStart) << self shiftForWord */); if (((longAt(litVar)) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) { - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(litVar)); - referent = longAt((litVar + BaseHeaderSize)); - while (((referent & (tagMask())) == 0) - && (((longAt(referent)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { - referent = longAt((referent + BaseHeaderSize)); - } - litVar = referent; + litVar = unfollowatIndex(litVar, 4 /* currentBytecode bitAnd: 31 */); } /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((litVar + BaseHeaderSize) + 8 /* ValueIndex << self shiftForWord */)); @@ -3781,7 +3749,6 @@ /* pushLiteralVariableBytecode */ { sqInt litVar; - sqInt referent; VM_LABEL(pushLiteralVariableBytecode5); /* begin fetchNextBytecode */ @@ -3797,14 +3764,7 @@ assert(GIV(method) == (iframeMethod(localFP))); litVar = longAt((GIV(method) + BaseHeaderSize) + 48 /* ((currentBytecode bitAnd: 31) + LiteralStart) << self shiftForWord */); if (((longAt(litVar)) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) { - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(litVar)); - referent = longAt((litVar + BaseHeaderSize)); - while (((referent & (tagMask())) == 0) - && (((longAt(referent)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { - referent = longAt((referent + BaseHeaderSize)); - } - litVar = referent; + litVar = unfollowatIndex(litVar, 5 /* currentBytecode bitAnd: 31 */); } /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((litVar + BaseHeaderSize) + 8 /* ValueIndex << self shiftForWord */)); @@ -3816,7 +3776,6 @@ /* pushLiteralVariableBytecode */ { sqInt litVar; - sqInt referent; VM_LABEL(pushLiteralVariableBytecode6); /* begin fetchNextBytecode */ @@ -3832,14 +3791,7 @@ assert(GIV(method) == (iframeMethod(localFP))); litVar = longAt((GIV(method) + BaseHeaderSize) + 56 /* ((currentBytecode bitAnd: 31) + LiteralStart) << self shiftForWord */); if (((longAt(litVar)) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) { - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(litVar)); - referent = longAt((litVar + BaseHeaderSize)); - while (((referent & (tagMask())) == 0) - && (((longAt(referent)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { - referent = longAt((referent + BaseHeaderSize)); - } - litVar = referent; + litVar = unfollowatIndex(litVar, 6 /* currentBytecode bitAnd: 31 */); } /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((litVar + BaseHeaderSize) + 8 /* ValueIndex << self shiftForWord */)); @@ -3851,7 +3803,6 @@ /* pushLiteralVariableBytecode */ { sqInt litVar; - sqInt referent; VM_LABEL(pushLiteralVariableBytecode7); /* begin fetchNextBytecode */ @@ -3867,14 +3818,7 @@ assert(GIV(method) == (iframeMethod(localFP))); litVar = longAt((GIV(method) + BaseHeaderSize) + 64 /* ((currentBytecode bitAnd: 31) + LiteralStart) << self shiftForWord */); if (((longAt(litVar)) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) { - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(litVar)); - referent = longAt((litVar + BaseHeaderSize)); - while (((referent & (tagMask())) == 0) - && (((longAt(referent)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { - referent = longAt((referent + BaseHeaderSize)); - } - litVar = referent; + litVar = unfollowatIndex(litVar, 7 /* currentBytecode bitAnd: 31 */); } /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((litVar + BaseHeaderSize) + 8 /* ValueIndex << self shiftForWord */)); @@ -3886,7 +3830,6 @@ /* pushLiteralVariableBytecode */ { sqInt litVar; - sqInt referent; VM_LABEL(pushLiteralVariableBytecode8); /* begin fetchNextBytecode */ @@ -3902,14 +3845,7 @@ assert(GIV(method) == (iframeMethod(localFP))); litVar = longAt((GIV(method) + BaseHeaderSize) + 72 /* ((currentBytecode bitAnd: 31) + LiteralStart) << self shiftForWord */); if (((longAt(litVar)) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) { - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(litVar)); - referent = longAt((litVar + BaseHeaderSize)); - while (((referent & (tagMask())) == 0) - && (((longAt(referent)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { - referent = longAt((referent + BaseHeaderSize)); - } - litVar = referent; + litVar = unfollowatIndex(litVar, 8 /* currentBytecode bitAnd: 31 */); } /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((litVar + BaseHeaderSize) + 8 /* ValueIndex << self shiftForWord */)); @@ -3921,7 +3857,6 @@ /* pushLiteralVariableBytecode */ { sqInt litVar; - sqInt referent; VM_LABEL(pushLiteralVariableBytecode9); /* begin fetchNextBytecode */ @@ -3937,14 +3872,7 @@ assert(GIV(method) == (iframeMethod(localFP))); litVar = longAt((GIV(method) + BaseHeaderSize) + 80 /* ((currentBytecode bitAnd: 31) + LiteralStart) << self shiftForWord */); if (((longAt(litVar)) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) { - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(litVar)); - referent = longAt((litVar + BaseHeaderSize)); - while (((referent & (tagMask())) == 0) - && (((longAt(referent)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { - referent = longAt((referent + BaseHeaderSize)); - } - litVar = referent; + litVar = unfollowatIndex(litVar, 9 /* currentBytecode bitAnd: 31 */); } /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((litVar + BaseHeaderSize) + 8 /* ValueIndex << self shiftForWord */)); @@ -3956,7 +3884,6 @@ /* pushLiteralVariableBytecode */ { sqInt litVar; - sqInt referent; VM_LABEL(pushLiteralVariableBytecode10); /* begin fetchNextBytecode */ @@ -3972,14 +3899,7 @@ assert(GIV(method) == (iframeMethod(localFP))); litVar = longAt((GIV(method) + BaseHeaderSize) + 88 /* ((currentBytecode bitAnd: 31) + LiteralStart) << self shiftForWord */); if (((longAt(litVar)) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) { - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(litVar)); - referent = longAt((litVar + BaseHeaderSize)); - while (((referent & (tagMask())) == 0) - && (((longAt(referent)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { - referent = longAt((referent + BaseHeaderSize)); - } - litVar = referent; + litVar = unfollowatIndex(litVar, 10 /* currentBytecode bitAnd: 31 */); } /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((litVar + BaseHeaderSize) + 8 /* ValueIndex << self shiftForWord */)); @@ -3991,7 +3911,6 @@ /* pushLiteralVariableBytecode */ { sqInt litVar; - sqInt referent; VM_LABEL(pushLiteralVariableBytecode11); /* begin fetchNextBytecode */ @@ -4007,14 +3926,7 @@ assert(GIV(method) == (iframeMethod(localFP))); litVar = longAt((GIV(method) + BaseHeaderSize) + 96 /* ((currentBytecode bitAnd: 31) + LiteralStart) << self shiftForWord */); if (((longAt(litVar)) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) { - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(litVar)); - referent = longAt((litVar + BaseHeaderSize)); - while (((referent & (tagMask())) == 0) - && (((longAt(referent)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { - referent = longAt((referent + BaseHeaderSize)); - } - litVar = referent; + litVar = unfollowatIndex(litVar, 11 /* currentBytecode bitAnd: 31 */); } /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((litVar + BaseHeaderSize) + 8 /* ValueIndex << self shiftForWord */)); @@ -4026,7 +3938,6 @@ /* pushLiteralVariableBytecode */ { sqInt litVar; - sqInt referent; VM_LABEL(pushLiteralVariableBytecode12); /* begin fetchNextBytecode */ @@ -4042,14 +3953,7 @@ assert(GIV(method) == (iframeMethod(localFP))); litVar = longAt((GIV(method) + BaseHeaderSize) + 104 /* ((currentBytecode bitAnd: 31) + LiteralStart) << self shiftForWord */); if (((longAt(litVar)) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) { - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(litVar)); - referent = longAt((litVar + BaseHeaderSize)); - while (((referent & (tagMask())) == 0) - && (((longAt(referent)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { - referent = longAt((referent + BaseHeaderSize)); - } - litVar = referent; + litVar = unfollowatIndex(litVar, 12 /* currentBytecode bitAnd: 31 */); } /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((litVar + BaseHeaderSize) + 8 /* ValueIndex << self shiftForWord */)); @@ -4061,7 +3965,6 @@ /* pushLiteralVariableBytecode */ { sqInt litVar; - sqInt referent; VM_LABEL(pushLiteralVariableBytecode13); /* begin fetchNextBytecode */ @@ -4077,14 +3980,7 @@ assert(GIV(method) == (iframeMethod(localFP))); litVar = longAt((GIV(method) + BaseHeaderSize) + 112 /* ((currentBytecode bitAnd: 31) + LiteralStart) << self shiftForWord */); if (((longAt(litVar)) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) { - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(litVar)); - referent = longAt((litVar + BaseHeaderSize)); - while (((referent & (tagMask())) == 0) - && (((longAt(referent)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { - referent = longAt((referent + BaseHeaderSize)); - } - litVar = referent; + litVar = unfollowatIndex(litVar, 13 /* currentBytecode bitAnd: 31 */); } /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((litVar + BaseHeaderSize) + 8 /* ValueIndex << self shiftForWord */)); @@ -4096,7 +3992,6 @@ /* pushLiteralVariableBytecode */ { sqInt litVar; - sqInt referent; VM_LABEL(pushLiteralVariableBytecode14); /* begin fetchNextBytecode */ @@ -4112,14 +4007,7 @@ assert(GIV(method) == (iframeMethod(localFP))); litVar = longAt((GIV(method) + BaseHeaderSize) + 120 /* ((currentBytecode bitAnd: 31) + LiteralStart) << self shiftForWord */); if (((longAt(litVar)) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) { - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(litVar)); - referent = longAt((litVar + BaseHeaderSize)); - while (((referent & (tagMask())) == 0) - && (((longAt(referent)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { - referent = longAt((referent + BaseHeaderSize)); - } - litVar = referent; + litVar = unfollowatIndex(litVar, 14 /* currentBytecode bitAnd: 31 */); } /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((litVar + BaseHeaderSize) + 8 /* ValueIndex << self shiftForWord */)); @@ -4131,7 +4019,6 @@ /* pushLiteralVariableBytecode */ { sqInt litVar; - sqInt referent; VM_LABEL(pushLiteralVariableBytecode15); /* begin fetchNextBytecode */ @@ -4147,14 +4034,7 @@ assert(GIV(method) == (iframeMethod(localFP))); litVar = longAt((GIV(method) + BaseHeaderSize) + 128 /* ((currentBytecode bitAnd: 31) + LiteralStart) << self shiftForWord */); if (((longAt(litVar)) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) { - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(litVar)); - referent = longAt((litVar + BaseHeaderSize)); - while (((referent & (tagMask())) == 0) - && (((longAt(referent)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { - referent = longAt((referent + BaseHeaderSize)); - } - litVar = referent; + litVar = unfollowatIndex(litVar, 15 /* currentBytecode bitAnd: 31 */); } /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((litVar + BaseHeaderSize) + 8 /* ValueIndex << self shiftForWord */)); @@ -4165,7 +4045,6 @@ /* pushLiteralVariableBytecode */ { sqInt litVar; - sqInt referent; VM_LABEL(pushLiteralVariableBytecode16); /* begin fetchNextBytecode */ @@ -4181,14 +4060,7 @@ assert(GIV(method) == (iframeMethod(localFP))); litVar = longAt((GIV(method) + BaseHeaderSize) + 136 /* ((currentBytecode bitAnd: 31) + LiteralStart) << self shiftForWord */); if (((longAt(litVar)) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) { - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(litVar)); - referent = longAt((litVar + BaseHeaderSize)); - while (((referent & (tagMask())) == 0) - && (((longAt(referent)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { - referent = longAt((referent + BaseHeaderSize)); - } - litVar = referent; + litVar = unfollowatIndex(litVar, 16 /* currentBytecode bitAnd: 31 */); } /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((litVar + BaseHeaderSize) + 8 /* ValueIndex << self shiftForWord */)); @@ -4199,7 +4071,6 @@ /* pushLiteralVariableBytecode */ { sqInt litVar; - sqInt referent; VM_LABEL(pushLiteralVariableBytecode17); /* begin fetchNextBytecode */ @@ -4215,14 +4086,7 @@ assert(GIV(method) == (iframeMethod(localFP))); litVar = longAt((GIV(method) + BaseHeaderSize) + 144 /* ((currentBytecode bitAnd: 31) + LiteralStart) << self shiftForWord */); if (((longAt(litVar)) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) { - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(litVar)); - referent = longAt((litVar + BaseHeaderSize)); - while (((referent & (tagMask())) == 0) - && (((longAt(referent)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { - referent = longAt((referent + BaseHeaderSize)); - } - litVar = referent; + litVar = unfollowatIndex(litVar, 17 /* currentBytecode bitAnd: 31 */); } /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((litVar + BaseHeaderSize) + 8 /* ValueIndex << self shiftForWord */)); @@ -4233,7 +4097,6 @@ /* pushLiteralVariableBytecode */ { sqInt litVar; - sqInt referent; VM_LABEL(pushLiteralVariableBytecode18); /* begin fetchNextBytecode */ @@ -4249,14 +4112,7 @@ assert(GIV(method) == (iframeMethod(localFP))); litVar = longAt((GIV(method) + BaseHeaderSize) + 152 /* ((currentBytecode bitAnd: 31) + LiteralStart) << self shiftForWord */); if (((longAt(litVar)) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) { - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(litVar)); - referent = longAt((litVar + BaseHeaderSize)); - while (((referent & (tagMask())) == 0) - && (((longAt(referent)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { - referent = longAt((referent + BaseHeaderSize)); - } - litVar = referent; + litVar = unfollowatIndex(litVar, 18 /* currentBytecode bitAnd: 31 */); } /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((litVar + BaseHeaderSize) + 8 /* ValueIndex << self shiftForWord */)); @@ -4267,7 +4123,6 @@ /* pushLiteralVariableBytecode */ { sqInt litVar; - sqInt referent; VM_LABEL(pushLiteralVariableBytecode19); /* begin fetchNextBytecode */ @@ -4283,14 +4138,7 @@ assert(GIV(method) == (iframeMethod(localFP))); litVar = longAt((GIV(method) + BaseHeaderSize) + 160 /* ((currentBytecode bitAnd: 31) + LiteralStart) << self shiftForWord */); if (((longAt(litVar)) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) { - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(litVar)); - referent = longAt((litVar + BaseHeaderSize)); - while (((referent & (tagMask())) == 0) - && (((longAt(referent)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { - referent = longAt((referent + BaseHeaderSize)); - } - litVar = referent; + litVar = unfollowatIndex(litVar, 19 /* currentBytecode bitAnd: 31 */); } /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((litVar + BaseHeaderSize) + 8 /* ValueIndex << self shiftForWord */)); @@ -4301,7 +4149,6 @@ /* pushLiteralVariableBytecode */ { sqInt litVar; - sqInt referent; VM_LABEL(pushLiteralVariableBytecode20); /* begin fetchNextBytecode */ @@ -4317,14 +4164,7 @@ assert(GIV(method) == (iframeMethod(localFP))); litVar = longAt((GIV(method) + BaseHeaderSize) + 168 /* ((currentBytecode bitAnd: 31) + LiteralStart) << self shiftForWord */); if (((longAt(litVar)) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) { - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(litVar)); - referent = longAt((litVar + BaseHeaderSize)); - while (((referent & (tagMask())) == 0) - && (((longAt(referent)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { - referent = longAt((referent + BaseHeaderSize)); - } - litVar = referent; + litVar = unfollowatIndex(litVar, 20 /* currentBytecode bitAnd: 31 */); } /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((litVar + BaseHeaderSize) + 8 /* ValueIndex << self shiftForWord */)); @@ -4335,7 +4175,6 @@ /* pushLiteralVariableBytecode */ { sqInt litVar; - sqInt referent; VM_LABEL(pushLiteralVariableBytecode21); /* begin fetchNextBytecode */ @@ -4351,14 +4190,7 @@ assert(GIV(method) == (iframeMethod(localFP))); litVar = longAt((GIV(method) + BaseHeaderSize) + 176 /* ((currentBytecode bitAnd: 31) + LiteralStart) << self shiftForWord */); if (((longAt(litVar)) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) { - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(litVar)); - referent = longAt((litVar + BaseHeaderSize)); - while (((referent & (tagMask())) == 0) - && (((longAt(referent)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { - referent = longAt((referent + BaseHeaderSize)); - } - litVar = referent; + litVar = unfollowatIndex(litVar, 21 /* currentBytecode bitAnd: 31 */); } /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((litVar + BaseHeaderSize) + 8 /* ValueIndex << self shiftForWord */)); @@ -4369,7 +4201,6 @@ /* pushLiteralVariableBytecode */ { sqInt litVar; - sqInt referent; VM_LABEL(pushLiteralVariableBytecode22); /* begin fetchNextBytecode */ @@ -4385,14 +4216,7 @@ assert(GIV(method) == (iframeMethod(localFP))); litVar = longAt((GIV(method) + BaseHeaderSize) + 184 /* ((currentBytecode bitAnd: 31) + LiteralStart) << self shiftForWord */); if (((longAt(litVar)) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) { - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(litVar)); - referent = longAt((litVar + BaseHeaderSize)); - while (((referent & (tagMask())) == 0) - && (((longAt(referent)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { - referent = longAt((referent + BaseHeaderSize)); - } - litVar = referent; + litVar = unfollowatIndex(litVar, 22 /* currentBytecode bitAnd: 31 */); } /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((litVar + BaseHeaderSize) + 8 /* ValueIndex << self shiftForWord */)); @@ -4403,7 +4227,6 @@ /* pushLiteralVariableBytecode */ { sqInt litVar; - sqInt referent; VM_LABEL(pushLiteralVariableBytecode23); /* begin fetchNextBytecode */ @@ -4419,14 +4242,7 @@ assert(GIV(method) == (iframeMethod(localFP))); litVar = longAt((GIV(method) + BaseHeaderSize) + 192 /* ((currentBytecode bitAnd: 31) + LiteralStart) << self shiftForWord */); if (((longAt(litVar)) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) { - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(litVar)); - referent = longAt((litVar + BaseHeaderSize)); - while (((referent & (tagMask())) == 0) - && (((longAt(referent)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { - referent = longAt((referent + BaseHeaderSize)); - } - litVar = referent; + litVar = unfollowatIndex(litVar, 23 /* currentBytecode bitAnd: 31 */); } /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((litVar + BaseHeaderSize) + 8 /* ValueIndex << self shiftForWord */)); @@ -4437,7 +4253,6 @@ /* pushLiteralVariableBytecode */ { sqInt litVar; - sqInt referent; VM_LABEL(pushLiteralVariableBytecode24); /* begin fetchNextBytecode */ @@ -4453,14 +4268,7 @@ assert(GIV(method) == (iframeMethod(localFP))); litVar = longAt((GIV(method) + BaseHeaderSize) + 200 /* ((currentBytecode bitAnd: 31) + LiteralStart) << self shiftForWord */); if (((longAt(litVar)) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) { - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(litVar)); - referent = longAt((litVar + BaseHeaderSize)); - while (((referent & (tagMask())) == 0) - && (((longAt(referent)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { - referent = longAt((referent + BaseHeaderSize)); - } - litVar = referent; + litVar = unfollowatIndex(litVar, 24 /* currentBytecode bitAnd: 31 */); } /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((litVar + BaseHeaderSize) + 8 /* ValueIndex << self shiftForWord */)); @@ -4471,7 +4279,6 @@ /* pushLiteralVariableBytecode */ { sqInt litVar; - sqInt referent; VM_LABEL(pushLiteralVariableBytecode25); /* begin fetchNextBytecode */ @@ -4487,14 +4294,7 @@ assert(GIV(method) == (iframeMethod(localFP))); litVar = longAt((GIV(method) + BaseHeaderSize) + 208 /* ((currentBytecode bitAnd: 31) + LiteralStart) << self shiftForWord */); if (((longAt(litVar)) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) { - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(litVar)); - referent = longAt((litVar + BaseHeaderSize)); - while (((referent & (tagMask())) == 0) - && (((longAt(referent)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { - referent = longAt((referent + BaseHeaderSize)); - } - litVar = referent; + litVar = unfollowatIndex(litVar, 25 /* currentBytecode bitAnd: 31 */); } /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((litVar + BaseHeaderSize) + 8 /* ValueIndex << self shiftForWord */)); @@ -4505,7 +4305,6 @@ /* pushLiteralVariableBytecode */ { sqInt litVar; - sqInt referent; VM_LABEL(pushLiteralVariableBytecode26); /* begin fetchNextBytecode */ @@ -4521,14 +4320,7 @@ assert(GIV(method) == (iframeMethod(localFP))); litVar = longAt((GIV(method) + BaseHeaderSize) + 216 /* ((currentBytecode bitAnd: 31) + LiteralStart) << self shiftForWord */); if (((longAt(litVar)) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) { - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(litVar)); - referent = longAt((litVar + BaseHeaderSize)); - while (((referent & (tagMask())) == 0) - && (((longAt(referent)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { - referent = longAt((referent + BaseHeaderSize)); - } - litVar = referent; + litVar = unfollowatIndex(litVar, 26 /* currentBytecode bitAnd: 31 */); } /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((litVar + BaseHeaderSize) + 8 /* ValueIndex << self shiftForWord */)); @@ -4539,7 +4331,6 @@ /* pushLiteralVariableBytecode */ { sqInt litVar; - sqInt referent; VM_LABEL(pushLiteralVariableBytecode27); /* begin fetchNextBytecode */ @@ -4555,14 +4346,7 @@ assert(GIV(method) == (iframeMethod(localFP))); litVar = longAt((GIV(method) + BaseHeaderSize) + 224 /* ((currentBytecode bitAnd: 31) + LiteralStart) << self shiftForWord */); if (((longAt(litVar)) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) { - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(litVar)); - referent = longAt((litVar + BaseHeaderSize)); - while (((referent & (tagMask())) == 0) - && (((longAt(referent)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { - referent = longAt((referent + BaseHeaderSize)); - } - litVar = referent; + litVar = unfollowatIndex(litVar, 27 /* currentBytecode bitAnd: 31 */); } /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((litVar + BaseHeaderSize) + 8 /* ValueIndex << self shiftForWord */)); @@ -4573,7 +4357,6 @@ /* pushLiteralVariableBytecode */ { sqInt litVar; - sqInt referent; VM_LABEL(pushLiteralVariableBytecode28); /* begin fetchNextBytecode */ @@ -4589,14 +4372,7 @@ assert(GIV(method) == (iframeMethod(localFP))); litVar = longAt((GIV(method) + BaseHeaderSize) + 232 /* ((currentBytecode bitAnd: 31) + LiteralStart) << self shiftForWord */); if (((longAt(litVar)) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) { - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(litVar)); - referent = longAt((litVar + BaseHeaderSize)); - while (((referent & (tagMask())) == 0) - && (((longAt(referent)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { - referent = longAt((referent + BaseHeaderSize)); - } - litVar = referent; + litVar = unfollowatIndex(litVar, 28 /* currentBytecode bitAnd: 31 */); } /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((litVar + BaseHeaderSize) + 8 /* ValueIndex << self shiftForWord */)); @@ -4607,7 +4383,6 @@ /* pushLiteralVariableBytecode */ { sqInt litVar; - sqInt referent; VM_LABEL(pushLiteralVariableBytecode29); /* begin fetchNextBytecode */ @@ -4623,14 +4398,7 @@ assert(GIV(method) == (iframeMethod(localFP))); litVar = longAt((GIV(method) + BaseHeaderSize) + 240 /* ((currentBytecode bitAnd: 31) + LiteralStart) << self shiftForWord */); if (((longAt(litVar)) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) { - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(litVar)); - referent = longAt((litVar + BaseHeaderSize)); - while (((referent & (tagMask())) == 0) - && (((longAt(referent)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { - referent = longAt((referent + BaseHeaderSize)); - } - litVar = referent; + litVar = unfollowatIndex(litVar, 29 /* currentBytecode bitAnd: 31 */); } /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((litVar + BaseHeaderSize) + 8 /* ValueIndex << self shiftForWord */)); @@ -4641,7 +4409,6 @@ /* pushLiteralVariableBytecode */ { sqInt litVar; - sqInt referent; VM_LABEL(pushLiteralVariableBytecode30); /* begin fetchNextBytecode */ @@ -4657,14 +4424,7 @@ assert(GIV(method) == (iframeMethod(localFP))); litVar = longAt((GIV(method) + BaseHeaderSize) + 0xF8 /* ((currentBytecode bitAnd: 31) + LiteralStart) << self shiftForWord */); if (((longAt(litVar)) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) { - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(litVar)); - referent = longAt((litVar + BaseHeaderSize)); - while (((referent & (tagMask())) == 0) - && (((longAt(referent)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { - referent = longAt((referent + BaseHeaderSize)); - } - litVar = referent; + litVar = unfollowatIndex(litVar, 30 /* currentBytecode bitAnd: 31 */); } /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((litVar + BaseHeaderSize) + 8 /* ValueIndex << self shiftForWord */)); @@ -4675,7 +4435,6 @@ /* pushLiteralVariableBytecode */ { sqInt litVar; - sqInt referent; VM_LABEL(pushLiteralVariableBytecode31); /* begin fetchNextBytecode */ @@ -4691,14 +4450,7 @@ assert(GIV(method) == (iframeMethod(localFP))); litVar = longAt((GIV(method) + BaseHeaderSize) + 256 /* ((currentBytecode bitAnd: 31) + LiteralStart) << self shiftForWord */); if (((longAt(litVar)) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) { - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(litVar)); - referent = longAt((litVar + BaseHeaderSize)); - while (((referent & (tagMask())) == 0) - && (((longAt(referent)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { - referent = longAt((referent + BaseHeaderSize)); - } - litVar = referent; + litVar = unfollowatIndex(litVar, 0x1F /* currentBytecode bitAnd: 31 */); } /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((litVar + BaseHeaderSize) + 8 /* ValueIndex << self shiftForWord */)); @@ -4740,7 +4492,7 @@ GIV(argumentCount) = 2; goto normalSend; /* return self */ - goto l8; + goto l7; } # endif /* IMMUTABILITY */ @@ -4759,7 +4511,7 @@ } } longAtput((rcvr + BaseHeaderSize) + (((long)instVarIndex) << (shiftForWord())), top); - l8: /* end storePointerImmutabilityCheck:ofObject:withValue: */; + l7: /* end storePointerImmutabilityCheck:ofObject:withValue: */; /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); @@ -5066,7 +4818,7 @@ frameToReturnTo = 0; if (!((byteAt((localFP + FoxIFrameFlags) + 3)) != 0)) { goto commonCallerReturn; - goto l413; + goto l408; } closure = longAt(localFP + (frameStackedReceiverOffsetNumArgs(((((usqInt)(longAt(localFP + FoxMethod)))) < (startOfMemory()) ? ((mframeCogMethod(localFP))->cmNumArgs) @@ -5116,10 +4868,10 @@ : (byteAt((localFP + FoxIFrameFlags) + 2)) != 0)) { assert(isContext(frameContext(localFP))); ourContext = longAt(localFP + FoxThisContext); - goto l419; + goto l414; } ourContext = marryFrameSP(localFP, localSP); - l419: /* end ensureFrameIsMarried:SP: */; + l414: /* end ensureFrameIsMarried:SP: */; /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), ourContext); /* begin internalPush: */ @@ -5127,7 +4879,7 @@ GIV(messageSelector) = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (((long)SelectorCannotReturn) << (shiftForWord()))); GIV(argumentCount) = 1; goto normalSend; - goto l413; + goto l408; } if (unwindContextOrNilOrZero != 0) { /* begin internalAboutToReturn:through: */ @@ -5136,10 +4888,10 @@ : (byteAt((localFP + FoxIFrameFlags) + 2)) != 0)) { assert(isContext(frameContext(localFP))); ourContext1 = longAt(localFP + FoxThisContext); - goto l416; + goto l411; } ourContext1 = marryFrameSP(localFP, localSP); - l416: /* end ensureFrameIsMarried:SP: */; + l411: /* end ensureFrameIsMarried:SP: */; /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), ourContext1); /* begin internalPush: */ @@ -5149,7 +4901,7 @@ GIV(messageSelector) = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (((long)SelectorAboutToReturn) << (shiftForWord()))); GIV(argumentCount) = 2; goto normalSend; - goto l413; + goto l408; } contextToReturnTo = null; if (((((longAt((home + BaseHeaderSize) + (((long)SenderIndex) << (shiftForWord()))))) & 7) == 1)) { @@ -5201,10 +4953,10 @@ : (byteAt((localFP + FoxIFrameFlags) + 2)) != 0)) { assert(isContext(frameContext(localFP))); ourContext2 = longAt(localFP + FoxThisContext); - goto l435; + goto l430; } ourContext2 = marryFrameSP(localFP, localSP); - l435: /* end ensureFrameIsMarried:SP: */; + l430: /* end ensureFrameIsMarried:SP: */; /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), ourContext2); /* begin internalPush: */ @@ -5212,7 +4964,7 @@ GIV(messageSelector) = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (((long)SelectorCannotReturn) << (shiftForWord()))); GIV(argumentCount) = 1; goto normalSend; - goto l413; + goto l408; } } assert(pageListIsWellFormed()); @@ -5317,11 +5069,11 @@ GIV(stackPointer) = localSP; GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); - goto l415; + goto l410; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); } - l415: /* end maybeReturnToMachineCodeFrame */; + l410: /* end maybeReturnToMachineCodeFrame */; /* begin setMethod: */ aMethodObj = longAt(localFP + FoxMethod); assert((((usqInt)aMethodObj)) >= (startOfMemory())); @@ -5336,7 +5088,7 @@ longAtPointerput(localSP, localReturnValue); } - l413: /* end case */; + l408: /* end case */; break; case 121: /* returnTrue */ @@ -5449,27 +5201,27 @@ fp = (thePage->headFP); if (fp == theFP) { frameAbove = 0; - goto l441; + goto l436; } while (((callerFP = pointerForOop(longAt(fp + FoxSavedFP)))) != 0) { if (callerFP == theFP) { frameAbove = fp; - goto l441; + goto l436; } fp = callerFP; } error("did not find theFP in stack page"); frameAbove = 0; - l441: /* end findFrameAbove:inPage: */; + l436: /* end findFrameAbove:inPage: */; /* begin newStackPage */ lruOrFree = (GIV(mostRecentlyUsedPage)->nextPage); if (((lruOrFree->baseFP)) == 0) { newPage = lruOrFree; - goto l445; + goto l440; } divorceFramesIn(lruOrFree); newPage = lruOrFree; - l445: /* end newStackPage */; + l440: /* end newStackPage */; assert(newPage == GIV(stackPage)); moveFramesInthroughtoPage(thePage, frameAbove, newPage); markStackPageMostRecentlyUsed(newPage); @@ -5492,7 +5244,7 @@ longAtput((sp2 = GIV(stackPointer) - BytesPerWord), GIV(instructionPointer)); GIV(stackPointer) = sp2; ceSendAborttonumArgs(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (((long)SelectorCannotReturn) << (shiftForWord()))), contextToReturnFrom, 1); - goto l437; + goto l432; } GIV(instructionPointer) = 0; thePage = makeBaseFrameFor(contextToReturnTo); @@ -5528,7 +5280,7 @@ GIV(stackPointer) = localSP; GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); - goto l437; + goto l432; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); } @@ -5546,7 +5298,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l437; + goto l432; } localIP = pointerForOop(longAt(localFP + FoxCallerSavedIP)); localSP = localFP + (frameStackedReceiverOffsetNumArgs(((((usqInt)(longAt(localFP + FoxMethod)))) < (startOfMemory()) @@ -5571,7 +5323,7 @@ GIV(stackPointer) = localSP; GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); - goto l437; + goto l432; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); } @@ -5589,7 +5341,7 @@ longAtPointerput(localSP, localReturnValue); } - l437: /* end case */; + l432: /* end case */; break; case 126: case 127: @@ -5618,10 +5370,10 @@ : (byteAt((localFP + FoxIFrameFlags) + 2)) != 0)) { assert(isContext(frameContext(localFP))); ourContext = longAt(localFP + FoxThisContext); - goto l446; + goto l441; } ourContext = marryFrameSP(localFP, localSP); - l446: /* end ensureFrameIsMarried:SP: */; + l441: /* end ensureFrameIsMarried:SP: */; localIP -= 1; /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), ourContext); @@ -5637,7 +5389,6 @@ sqInt litVar; sqInt object; sqInt object1; - sqInt referent; sqInt variableIndex; sqInt variableType; @@ -5651,7 +5402,7 @@ if (variableType == 0) { /* begin pushReceiverVariable: */ longAtPointerput((localSP -= BytesPerOop), longAt(((longAt(localFP + FoxIFReceiver)) + BaseHeaderSize) + (((long)variableIndex) << (shiftForWord())))); - goto l10; + goto l9; } if (variableType == 1) { /* begin pushTemporaryVariable: */ @@ -5659,14 +5410,14 @@ ? longAt((localFP + FoxCallerSavedIP) + ((frameNumArgs - variableIndex) * BytesPerWord)) : longAt(((localFP + FoxIFReceiver) - BytesPerWord) + ((frameNumArgs - variableIndex) * BytesPerWord))); longAtPointerput((localSP -= BytesPerOop), object); - goto l10; + goto l9; } if (variableType == 2) { /* begin pushLiteralConstant: */ assert(GIV(method) == (iframeMethod(localFP))); object1 = longAt((GIV(method) + BaseHeaderSize) + (((long)(variableIndex + LiteralStart)) << (shiftForWord()))); longAtPointerput((localSP -= BytesPerOop), object1); - goto l10; + goto l9; } if (variableType == 3) { /* begin pushLiteralVariable: */ @@ -5679,22 +5430,15 @@ assert(GIV(method) == (iframeMethod(localFP))); litVar = longAt((GIV(method) + BaseHeaderSize) + (((long)(variableIndex + LiteralStart)) << (shiftForWord()))); if (((longAt(litVar)) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) { - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(litVar)); - referent = longAt((litVar + BaseHeaderSize) + (0LL << (shiftForWord()))); - while (((referent & (tagMask())) == 0) - && (((longAt(referent)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { - referent = longAt((referent + BaseHeaderSize) + (0LL << (shiftForWord()))); - } - litVar = referent; + litVar = unfollowatIndex(litVar, variableIndex); } /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((litVar + BaseHeaderSize) + (((long)ValueIndex) << (shiftForWord())))); - goto l10; + goto l9; } } - l10: /* end case */; + l9: /* end case */; break; case 129: /* extendedStoreBytecode */ @@ -5731,7 +5475,7 @@ GIV(argumentCount) = 2; goto normalSend; /* return self */ - goto l19; + goto l17; } # endif /* IMMUTABILITY */ @@ -5750,11 +5494,11 @@ } } longAtput((objOop + BaseHeaderSize) + (((long)variableIndex) << (shiftForWord())), value); - l19: /* end storePointerImmutabilityCheck:ofObject:withValue: */; + l17: /* end storePointerImmutabilityCheck:ofObject:withValue: */; /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l16; + goto l14; } if (variableType == 1) { /* begin fetchNextBytecode */ @@ -5766,7 +5510,7 @@ else { longAtput(((localFP + FoxIFReceiver) - BytesPerWord) + ((frameNumArgs - variableIndex) * BytesPerWord), value); } @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.1873.mcz
by commits＠source.squeak.org 26 May '16

26 May '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1873.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1873 Author: eem Time: 26 May 2016, 12:38:39.23329 pm UUID: 5936290a-e2d7-4ec8-a354-59ba42623622 Ancestors: VMMaker.oscog-eem.1872 Phhhh, get the change to the FoatArrayPlugin right. Sorry for the confusion. =============== Diff against VMMaker.oscog-eem.1872 =============== Item was changed: ----- Method: FloatArrayPlugin>>sqrt: (in category 'simulation') ----- sqrt: aFloat + <doNotGenerate> ^aFloat sqrt!

1 0

VM Maker: VMMaker.oscog-eem.1872.mcz
by commits＠source.squeak.org 26 May '16

26 May '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1872.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1872 Author: eem Time: 26 May 2016, 12:24:21.998252 pm UUID: 6db6d610-b1a5-4f4d-978d-22c917bdb3e4 Ancestors: VMMaker.oscog-eem.1871 damn; fgix a slip in the last commit =============== Diff against VMMaker.oscog-eem.1871 =============== Item was changed: ----- Method: FloatArrayPlugin>>primitiveLength (in category 'arithmetic primitives') ----- primitiveLength "Primitive. Compute the length of the argument (sqrt of sum of component squares)." <export: true> | rcvr rcvrPtr length len | <var: #rcvrPtr type: #'float *'> <var: #len type: #double> rcvr := interpreterProxy stackValue: 0. (interpreterProxy isWords: rcvr) ifFalse: [interpreterProxy primitiveFailFor: PrimErrBadReceiver]. length := interpreterProxy stSizeOf: rcvr. + rcvrPtr := self cCoerce: (interpreterProxy firstIndexableField: rcvr) to: #'float *'. - rcvrPtr := self cCoerce: (interpreterProxy firstIndexableField: rcvr) to: 'float *'. len := 0.0. 0 to: length-1 do:[:i| len := len + ((self cCoerce: (rcvrPtr at: i) to: #double) * (self cCoerce: (rcvrPtr at: i) to: #double)). ]. len > 0.0 ifFalse: [interpreterProxy primitiveFailFor: PrimErrBadReceiver]. interpreterProxy pop: 1 thenPush: (interpreterProxy floatObjectOf: (self sqrt: len))! Item was changed: ----- Method: FloatArrayPlugin>>primitiveNormalize (in category 'arithmetic primitives') ----- primitiveNormalize "Primitive. Normalize the argument (A FloatArray) in place." <export: true> | rcvr rcvrPtr length len | <var: #rcvrPtr type: #'float *'> <var: #len type: #double> rcvr := interpreterProxy stackValue: 0. (interpreterProxy isWords: rcvr) ifFalse: [interpreterProxy primitiveFailFor: PrimErrBadReceiver]. length := interpreterProxy stSizeOf: rcvr. + rcvrPtr := self cCoerce: (interpreterProxy firstIndexableField: rcvr) to: #'float *'. - rcvrPtr := self cCoerce: (interpreterProxy firstIndexableField: rcvr) to: 'float *'. len := 0.0. 0 to: length-1 do:[:i| len := len + ((self cCoerce: (rcvrPtr at: i) to: #double) * (self cCoerce: (rcvrPtr at: i) to: #double)). ]. len > 0.0 ifFalse: [interpreterProxy primitiveFailFor: PrimErrBadReceiver]. len := self sqrt: len. 0 to: length-1 do:[:i| rcvrPtr at: i put: ((self cCoerce: (rcvrPtr at: i) to: #double) / len). ]. "Leave receiver on the stack."!

1 0

VM Maker: VMMaker.oscog-eem.1871.mcz
by commits＠source.squeak.org 26 May '16

26 May '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1871.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1871 Author: eem Time: 26 May 2016, 12:22:31.837215 pm UUID: 94d585d5-c18f-4880-9d8e-c4fdb1e7427c Ancestors: VMMaker.oscog-eem.1870 Take a slightly more minimal approach to Esteban's FLoatArray changes in VMMaker.oscog-EstebanLorenzano.1869 =============== Diff against VMMaker.oscog-eem.1870 =============== Item was changed: ----- Method: FloatArrayPlugin>>primitiveLength (in category 'arithmetic primitives') ----- primitiveLength - "Primitive. Compute the length of the argument (sqrt of sum of component squares)." - - | rcvr rcvrPtr length result | <export: true> + | rcvr rcvrPtr length len | + <var: #rcvrPtr type: #'float *'> + <var: #len type: #double> + rcvr := interpreterProxy stackValue: 0. + (interpreterProxy isWords: rcvr) ifFalse: + [interpreterProxy primitiveFailFor: PrimErrBadReceiver]. - <var: #rcvrPtr type:'float *'> - <var: #result type:'double '> - rcvr := interpreterProxy stackObjectValue: 0. - interpreterProxy failed ifTrue:[^nil]. - interpreterProxy success: (interpreterProxy isWords: rcvr). - interpreterProxy failed ifTrue:[^nil]. length := interpreterProxy stSizeOf: rcvr. - interpreterProxy success: true. rcvrPtr := self cCoerce: (interpreterProxy firstIndexableField: rcvr) to: 'float *'. + len := 0.0. - result := 0.0. 0 to: length-1 do:[:i| + len := len + ((self cCoerce: (rcvrPtr at: i) to: #double) * (self cCoerce: (rcvrPtr at: i) to: #double)). - result := result + ((self cCoerce: (rcvrPtr at: i) to: 'double') * (self cCoerce: (rcvrPtr at: i) to: 'double')). ]. + len > 0.0 ifFalse: + [interpreterProxy primitiveFailFor: PrimErrBadReceiver]. + interpreterProxy pop: 1 thenPush: (interpreterProxy floatObjectOf: (self sqrt: len))! - result := self cCode: 'sqrt(result)' inSmalltalk: [result sqrt]. - interpreterProxy pop: 1 thenPush: (interpreterProxy floatObjectOf: result)! Item was changed: ----- Method: FloatArrayPlugin>>primitiveNormalize (in category 'arithmetic primitives') ----- primitiveNormalize - "Primitive. Normalize the argument (A FloatArray) in place." - - | rcvr rcvrPtr length len | <export: true> + | rcvr rcvrPtr length len | + <var: #rcvrPtr type: #'float *'> + <var: #len type: #double> + rcvr := interpreterProxy stackValue: 0. + (interpreterProxy isWords: rcvr) ifFalse: + [interpreterProxy primitiveFailFor: PrimErrBadReceiver]. - <var: #rcvrPtr type:'float *'> - <var: #len type:'double '> - rcvr := interpreterProxy stackObjectValue: 0. - interpreterProxy failed ifTrue:[^nil]. - interpreterProxy success: (interpreterProxy isWords: rcvr). - interpreterProxy failed ifTrue:[^nil]. length := interpreterProxy stSizeOf: rcvr. - interpreterProxy success: true. rcvrPtr := self cCoerce: (interpreterProxy firstIndexableField: rcvr) to: 'float *'. len := 0.0. 0 to: length-1 do:[:i| + len := len + ((self cCoerce: (rcvrPtr at: i) to: #double) * (self cCoerce: (rcvrPtr at: i) to: #double)). - len := len + ((self cCoerce: (rcvrPtr at: i) to: 'double') * (self cCoerce: (rcvrPtr at: i) to: 'double')). ]. + len > 0.0 ifFalse: + [interpreterProxy primitiveFailFor: PrimErrBadReceiver]. - interpreterProxy success: (len > 0.0). - interpreterProxy failed ifTrue:[^nil]. + len := self sqrt: len. - len := self cCode: 'sqrt(len)' inSmalltalk: [len sqrt]. 0 to: length-1 do:[:i| + rcvrPtr at: i put: ((self cCoerce: (rcvrPtr at: i) to: #double) / len). - rcvrPtr at: i put: ((self cCoerce: (rcvrPtr at: i) to: 'double') / len). ]. "Leave receiver on the stack."! Item was added: + ----- Method: FloatArrayPlugin>>sqrt: (in category 'simulation') ----- + sqrt: aFloat + ^aFloat sqrt!

1 0

VM Maker: VMMaker.oscog-eem.1870.mcz
by commits＠source.squeak.org 26 May '16

26 May '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1870.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1870 Author: eem Time: 26 May 2016, 12:10:14.605733 pm UUID: c5578dcb-22a8-4798-8aa0-097f5adbb95e Ancestors: VMMaker.oscog-eem.1868 Fix slang regression in VMMaker.oscog-eem.1868. See MessageNode>>asTranslatorNodeIn:. Fix ephemerons (at least for Gule's test case). The mournQueue is of course a root for teh scavenger and so must be visited at the start of a scavenge. Fix receiver in fireEphemeron:. Simulator: Make Spur clone the heap and do a lemming scavenge if leakCheckNewSpaceGC is set, just as ObjectMemory does. Update Spur's leak checker to scan the mournQueue. =============== Diff against VMMaker.oscog-eem.1868 =============== Item was removed: - ----- Method: Interpreter>>primitiveAtEnd (in category 'deprecated - array and stream primitives') ----- - primitiveAtEnd - "nb: This primitive was previously installed as primitive 67, but is no - longer in use." - | stream index limit | - stream := self popStack. - ((objectMemory isPointers: stream) - and: [(objectMemory lengthOf: stream) >= (StreamReadLimitIndex+1)]) - ifTrue: [index := self fetchInteger: StreamIndexIndex ofObject: stream. - limit := self fetchInteger: StreamReadLimitIndex ofObject: stream] - ifFalse: [self primitiveFail]. - self successful - ifTrue: [self pushBool: (index >= limit)] - ifFalse: [self unPop: 1].! Item was changed: ----- Method: MessageNode>>asTranslatorNodeIn: (in category '*VMMaker-C translation') ----- asTranslatorNodeIn: aTMethod "make a CCodeGenerator equivalent of me" "selector is sometimes a Symbol, sometimes a SelectorNode!! On top of this, numArgs is needed due to the (truly grody) use of arguments as a place to store the extra expressions needed to generate code for in-line to:by:do:, etc. see below, where it is used." | rcvrOrNil sel args ifNotNilBlock | rcvrOrNil := receiver ifNotNil: [receiver asTranslatorNodeIn: aTMethod]. (rcvrOrNil notNil and: [rcvrOrNil isVariable and: [rcvrOrNil name = 'super']]) ifTrue: [^aTMethod superExpansionNodeFor: selector key args: arguments]. sel := selector isSymbol ifTrue: [selector] ifFalse: [selector key]. (sel == #cCode:inSmalltalk: "extracting here rather than in translation allows inlining in the block." or: [sel == #cCode:]) ifTrue: [arguments first isBlockNode ifTrue: [| block | ^(block := arguments first asTranslatorNodeIn: aTMethod) statements size = 1 ifTrue: [block statements first] ifFalse: [block]]. (arguments first isLiteralNode + and: [arguments first key isString + and: [arguments first key isEmpty]]) ifTrue: - and: [arguments first key isString]) ifTrue: [^arguments first asTranslatorNodeIn: aTMethod]]. args := arguments select: [:arg| arg notNil] thenCollect: [:arg| arg asTranslatorNodeIn: aTMethod]. (sel = #to:by:do: and: [arguments size = 7 and: [(arguments at: 7) notNil]]) ifTrue: ["Restore limit expr that got moved by transformToDo:" args := {(arguments at: 7) value asTranslatorNodeIn: aTMethod. args second. args third. "add the limit var as a hidden extra argument; we may need it later" TVariableNode new setName: arguments first key}]. (sel == #ifTrue:ifFalse: and: [arguments first isJust: NodeNil]) ifTrue: [sel := #ifFalse:. args := {args last}]. (sel == #ifTrue:ifFalse: and: [arguments last isJust: NodeNil]) ifTrue: [sel := #ifTrue:. args := {args first}]. (sel == #ifFalse:ifTrue: and: [arguments first isJust: NodeNil]) ifTrue: [sel := #ifTrue:. args := {args last}]. (sel == #ifFalse:ifTrue: and: [arguments last isJust: NodeNil]) ifTrue: [sel := #ifTrue:. args := {args first}]. ((sel == #ifFalse: or: [sel == #or:]) and: [arguments size = 2 and: [(arguments at: 2) notNil]]) ifTrue: ["Restore argument block that got moved by transformOr: or transformIfFalse:" args := {(arguments at: 2) asTranslatorNodeIn: aTMethod}]. (args size > sel numArgs and: [sel ~~ #to:by:do:]) ifTrue: "to:by:do: has iLimiT hidden in last arg" ["prune the extra blocks left by ifTrue:, ifFalse:, and: & or:" self assert: args size - sel numArgs = 1. self assert: (args last isStmtList and: [args last statements size = 1 and: [(args last statements first isVariable or: [args last statements first isConstant]) and: [#('nil' true false) includes: args last statements first nameOrValue]]]). args := args first: sel numArgs]. "For the benefit of later passes, e.g. value: inlining, transform e ifNotNil: [:v| ...] into v := e. v ifNotNil: [...], which in fact means transforming (v := e) ifTrue: [:v|...] into v := e. v ifTrue: [...]." ((sel == #ifTrue: or: [sel == #ifFalse: or: [sel == #ifTrue:ifFalse: or: [sel == #ifFalse:ifTrue:]]]) and: [receiver notNil and: [receiver isAssignmentEqualsEqualsNil and: [(ifNotNilBlock := args detect: [:arg| arg isStmtList and: [arg args size = 1]] ifNone: []) notNil]]]) ifTrue: [ifNotNilBlock setArguments: #(). ^TStmtListNode new setArguments: #() statements: { receiver receiver asTranslatorNodeIn: aTMethod. TSendNode new setSelector: sel receiver: (TSendNode new setSelector: #== receiver: (receiver receiver variable asTranslatorNodeIn: aTMethod) arguments: {receiver arguments first asTranslatorNodeIn: aTMethod}) arguments: args }]. ^TSendNode new setSelector: sel receiver: rcvrOrNil arguments: args! Item was changed: + ----- Method: Spur32BitMMLECoSimulator>>scavengingGCTenuringIf: (in category 'gc - global') ----- - ----- Method: Spur32BitMMLECoSimulator>>scavengingGCTenuringIf: (in category 'generation scavenging') ----- scavengingGCTenuringIf: tenuringCriterion + "If we're /not/ a clone, clone the VM and push it over the cliff. + If it survives, destroy the clone and continue. We should be OK until next time." + (self leakCheckNewSpaceGC + and: [parent isNil]) ifTrue: + [coInterpreter cr; print: 'scavenge '; print: statScavenges; tab; flush. + coInterpreter cloneSimulation objectMemory scavengingGCTenuringIf: tenuringCriterion. + Smalltalk garbageCollect]. - "Run the scavenger." - "self halt: (statScavenges + 1) printString, ((statScavenges between: 9 and: 19) - ifTrue: ['th'] - ifFalse: [#('st' 'nd' 'rd') at: (statScavenges + 1) \\ 10 ifAbsent: 'th']), ' scavenge'." ^super scavengingGCTenuringIf: tenuringCriterion! Item was changed: + ----- Method: Spur32BitMMLESimulator>>scavengingGCTenuringIf: (in category 'gc - global') ----- - ----- Method: Spur32BitMMLESimulator>>scavengingGCTenuringIf: (in category 'generation scavenging') ----- scavengingGCTenuringIf: tenuringCriterion + "If we're /not/ a clone, clone the VM and push it over the cliff. + If it survives, destroy the clone and continue. We should be OK until next time." + (self leakCheckNewSpaceGC + and: [parent isNil]) ifTrue: + [coInterpreter cr; print: 'scavenge '; print: statScavenges; tab; flush. + coInterpreter cloneSimulation objectMemory scavengingGCTenuringIf: tenuringCriterion. + Smalltalk garbageCollect]. - "Run the scavenger." - "self halt: (statScavenges + 1) printString, ((statScavenges between: 9 and: 19) - ifTrue: ['th'] - ifFalse: [#('st' 'nd' 'rd') at: (statScavenges + 1) \\ 10 ifAbsent: 'th']), ' scavenge'." - - "statFullGCs > 0 ifTrue: - [self halt]." ^super scavengingGCTenuringIf: tenuringCriterion! Item was changed: + ----- Method: Spur64BitMMLECoSimulator>>scavengingGCTenuringIf: (in category 'gc - global') ----- - ----- Method: Spur64BitMMLECoSimulator>>scavengingGCTenuringIf: (in category 'generation scavenging') ----- scavengingGCTenuringIf: tenuringCriterion + "If we're /not/ a clone, clone the VM and push it over the cliff. + If it survives, destroy the clone and continue. We should be OK until next time." + (self leakCheckNewSpaceGC + and: [parent isNil]) ifTrue: + [coInterpreter cr; print: 'scavenge '; print: statScavenges; tab; flush. + coInterpreter cloneSimulation objectMemory scavengingGCTenuringIf: tenuringCriterion. + Smalltalk garbageCollect]. - "Run the scavenger." - "self halt: (statScavenges + 1) printString, ((statScavenges between: 9 and: 19) - ifTrue: ['th'] - ifFalse: [#('st' 'nd' 'rd') at: (statScavenges + 1) \\ 10 ifAbsent: 'th']), ' scavenge'." ^super scavengingGCTenuringIf: tenuringCriterion! Item was changed: + ----- Method: Spur64BitMMLESimulator>>scavengingGCTenuringIf: (in category 'gc - global') ----- - ----- Method: Spur64BitMMLESimulator>>scavengingGCTenuringIf: (in category 'generation scavenging') ----- scavengingGCTenuringIf: tenuringCriterion + "If we're /not/ a clone, clone the VM and push it over the cliff. + If it survives, destroy the clone and continue. We should be OK until next time." + (self leakCheckNewSpaceGC + and: [parent isNil]) ifTrue: + [coInterpreter cr; print: 'scavenge '; print: statScavenges; tab; flush. + coInterpreter cloneSimulation objectMemory scavengingGCTenuringIf: tenuringCriterion. + Smalltalk garbageCollect]. - "Run the scavenger." - "self halt: (statScavenges + 1) printString, ((statScavenges between: 9 and: 19) - ifTrue: ['th'] - ifFalse: [#('st' 'nd' 'rd') at: (statScavenges + 1) \\ 10 ifAbsent: 'th']), ' scavenge'." - - "statFullGCs > 0 ifTrue: - [self halt]." ^super scavengingGCTenuringIf: tenuringCriterion! Item was added: + ----- Method: SpurGenerationScavenger>>copyAndForwardMourner: (in category 'scavenger') ----- + copyAndForwardMourner: mourner + "A special version of copyAndForward: for objects in the mournQueue. If we're + in the good times tenuring regime then copy to futureSpace, otherwise tenure. + Also, don't repeat any of the ephemeron processing." + <inline: false> + | bytesInObj format tenure newLocation | + self assert: ((manager isInEden: mourner) "cog methods should be excluded." + or: [manager isInPastSpace: mourner]). + bytesInObj := manager bytesInObject: mourner. + format := manager formatOf: mourner. + tenure := self shouldMournerBeTenured: mourner. "Allow Slang to inline." + newLocation := (tenure or: [futureSurvivorStart + bytesInObj > futureSpace limit]) + ifTrue: [self copyToOldSpace: mourner bytes: bytesInObj format: format] + ifFalse: [self copyToFutureSpace: mourner bytes: bytesInObj]. + manager forwardSurvivor: mourner to: newLocation. + "if weak or ephemeron add to the relevant list for subsequent scanning." + (manager isWeakFormat: format) ifTrue: + [self addToWeakList: mourner]. + ^newLocation! Item was changed: ----- Method: SpurGenerationScavenger>>scavengeLoop (in category 'scavenger') ----- scavengeLoop "This is the inner loop of the main routine, scavenge. It first scavenges the new objects immediately reachable from old ones. Then it scavenges those that are transitively reachable. If this results in a promotion, the promotee gets remembered, and it first scavenges objects adjacent to the promotee, then scavenges the ones reachable from the promoted. This loop continues until no more reachable objects are left. At that point, pastSurvivorSpace is exchanged with futureSurvivorSpace. Notice that each pointer in a live object is inspected once and only once. The previousRememberedSetSize and previousFutureSurvivorSpaceLimit variables ensure that no object is scanned twice, as well as detecting closure. If this were not true, some pointers might get forwarded twice. An extension of the algorithm presented in David's original paper is to handle weak arrays and ephemerons. Weak arrays should not have their weak referents scavenged unless there are strong references to them. Ephemerons should fire if their key is not reachable other than from ephemerons and weak arrays. Handle this by maintaining a list for weak arrays and a list for ephemerons, which allow scavenging these objects once all other objects in new space have been scavenged, hence allowing the scavenger to detect which referents in new space of weak arrays are dead and of ephemeron keys are only live due to ephemerons. Read the class comment for a more in-depth description of the algorithm." <inline: false> | previousFutureSurvivorStart firstTime | self assert: futureSurvivorStart = futureSpace start. "future space should be empty at the start" weakList := ephemeronList := nil. numRememberedEphemerons := 0. firstTime := true. previousRememberedSetSize := 0. previousFutureSurvivorStart := futureSurvivorStart. coInterpreter initStackPageGC. [self scavengeRememberedSetStartingAt: previousRememberedSetSize. previousRememberedSetSize := rememberedSetSize. firstTime ifTrue: [coInterpreter mapInterpreterOops. + manager mapMournQueue. manager mapExtraRoots. firstTime := false]. "if nothing more copied and forwarded (or remembered by mapInterpreterOops) to scavenge, and no ephemerons to process, scavenge is done." (previousRememberedSetSize = rememberedSetSize and: [previousFutureSurvivorStart = futureSurvivorStart and: [numRememberedEphemerons = 0 and: [ephemeronList isNil]]]) ifTrue: [^self]. self scavengeFutureSurvivorSpaceStartingAt: previousFutureSurvivorStart. previousFutureSurvivorStart := futureSurvivorStart. "no more roots created to scavenge..." previousRememberedSetSize = rememberedSetSize ifTrue: [(numRememberedEphemerons = 0 and: [ephemeronList isNil]) ifTrue: [^self]. "no ephemerons to process, scavenge is done." "all reachable objects in this cycle have been promoted to futureSpace. ephemerons can now be processed." self processEphemerons]] repeat! Item was added: + ----- Method: SpurGenerationScavenger>>shouldMournerBeTenured: (in category 'scavenger') ----- + shouldMournerBeTenured: survivor + "Answer if an object in the mourn queue should be tenured. If we're + in the good times tenuring regime then copy to futureSpace, otherwise tenure." + ^(tenureCriterion = TenureByAge and: [tenureThreshold = 0]) not! Item was changed: ----- Method: SpurMemoryManager class>>initialize (in category 'class initialization') ----- initialize "SpurMemoryManager initialize" BitsPerByte := 8. "Initialize at least the become constants for the Spur bootstrap where the old ObjectMemory simulator is used before a Spur simulator is created.." self initializeSpurObjectRepresentationConstants. "Pig compact can be repeated to compact better. Experience shows that 3 times compacts very well, desirable for snapshots. But this is overkill for normal GCs." CompactionPassesForGC := 2. CompactionPassesForSnapshot := 3. "An obj stack is a stack of objects stored in a hidden root slot, such as the markStack or the ephemeronQueue. It is a linked list of segments, with the hot end at the head of the list. It is a word object. The stack pointer is in ObjStackTopx and 0 means empty. The list goes through ObjStackNextx. We don't want to shrink objStacks, since they're used + in GC and it's good to keep their memory around. So unused pages + created by popping emptied pages are kept on the ObjStackFreex list. - in GC and its good to keep their memory around. So unused pages - created by popping emptying pages are kept on the ObjStackFreex list. ObjStackNextx must be the last field for swizzleObjStackAt:." ObjStackPageSlots := 4092. "+ double header = 16k bytes per page in 32-bits" ObjStackTopx := 0. ObjStackMyx := 1. ObjStackFreex := 2. ObjStackNextx := 3. ObjStackFixedSlots := 4. ObjStackLimit := ObjStackPageSlots - ObjStackFixedSlots. "The hiddenHootsObject contains the classTable pages and up to 8 additional objects. Currently we use four; the three objStacks, the mark stack, the weaklings and the mourn queue, and the rememberedSet." MarkStackRootIndex := self basicNew classTableRootSlots. WeaklingStackRootIndex := MarkStackRootIndex + 1. MournQueueRootIndex := MarkStackRootIndex + 2. RememberedSetRootIndex := MarkStackRootIndex + 3. MarkObjectsForEnumerationPrimitives := false. "The remap buffer support is for compatibility; Spur doesn't GC during allocation. Eventually this should die." RemapBufferSize := 25. "Extra roots are for plugin support." ExtraRootsSize := 2048 "max. # of external roots"! Item was changed: ----- Method: SpurMemoryManager>>checkHeapIntegrity:classIndicesShouldBeValid: (in category 'debug support') ----- checkHeapIntegrity: excludeUnmarkedNewSpaceObjs classIndicesShouldBeValid: classIndicesShouldBeValid "Perform an integrity/leak check using the heapMap. Assume clearLeakMapAndMapAccessibleObjects has set a bit at each (non-free) object's header. Scan all objects in the heap checking that every pointer points to a header. Scan the rememberedSet, remapBuffer and extraRootTable checking that every entry is a pointer to a header. Check that the number of roots is correct and that all rememberedSet entries have their isRemembered: flag set. Answer if all checks pass." | ok numRememberedObjectsInHeap | <inline: false> ok := true. numRememberedObjectsInHeap := 0. 0 to: self numFreeLists - 1 do: [:i| (freeLists at: i) ~= 0 ifTrue: [(heapMap heapMapAtWord: (self pointerForOop: (freeLists at: i))) ~= 0 ifTrue: [coInterpreter print: 'leak in free list '; printNum: i; print: ' to non-free '; printHex: (freeLists at: i); cr. self eek. ok := false]]]. "Excuse the duplication but performance is at a premium and we avoid some tests by splitting the newSpace and oldSpace enumerations." self allNewSpaceEntitiesDo: [:obj| | fieldOop classIndex classOop | (self isFreeObject: obj) ifTrue: [coInterpreter print: 'young object '; printHex: obj; print: ' is free'; cr. self eek. ok := false] ifFalse: [((self isMarked: obj) not and: [excludeUnmarkedNewSpaceObjs]) ifFalse: [(self isRemembered: obj) ifTrue: [coInterpreter print: 'young object '; printHex: obj; print: ' is remembered'; cr. self eek. ok := false]]. (self isForwarded: obj) ifTrue: [fieldOop := self fetchPointer: 0 ofMaybeForwardedObject: obj. (heapMap heapMapAtWord: (self pointerForOop: fieldOop)) = 0 ifTrue: [coInterpreter print: 'object leak in forwarder '; printHex: obj; print: ' to unmapped '; printHex: fieldOop; cr. self eek. ok := false]] ifFalse: [classOop := self classOrNilAtIndex: (classIndex := self classIndexOf: obj). (classIndicesShouldBeValid and: [classOop = nilObj and: [(self isHiddenObj: obj) not]]) ifTrue: [coInterpreter print: 'object leak in '; printHex: obj; print: ' invalid class index '; printHex: classIndex; print: ' -> '; print: (classOop ifNil: ['nil'] ifNotNil: ['nilObj']); cr. self eek. ok := false]. 0 to: (self numPointerSlotsOf: obj) - 1 do: [:fi| fieldOop := self fetchPointer: fi ofObject: obj. (self isNonImmediate: fieldOop) ifTrue: [(heapMap heapMapAtWord: (self pointerForOop: fieldOop)) = 0 ifTrue: [coInterpreter print: 'object leak in '; printHex: obj; print: ' @ '; printNum: fi; print: ' = '; printHex: fieldOop; cr. self eek. ok := false]]]]]]. self allOldSpaceEntitiesDo: [:obj| | containsYoung fieldOop classIndex classOop | (self isFreeObject: obj) ifTrue: [(heapMap heapMapAtWord: (self pointerForOop: obj)) ~= 0 ifTrue: [coInterpreter print: 'leak in free chunk '; printHex: obj; print: ' is mapped?!! '; cr. self eek. ok := false]. fieldOop := self fetchPointer: self freeChunkNextIndex ofFreeChunk: obj. (fieldOop ~= 0 and: [(heapMap heapMapAtWord: (self pointerForOop: obj)) ~= 0]) ifTrue: [coInterpreter print: 'leak in free chunk '; printHex: obj; print: ' @ 0 = '; printHex: fieldOop; print: ' is mapped'; cr. self eek. ok := false]. (self isLargeFreeObject: obj) ifTrue: [self freeChunkParentIndex to: self freeChunkLargerIndex do: [:fi| fieldOop := self fetchPointer: fi ofFreeChunk: obj. (fieldOop ~= 0 and: [(heapMap heapMapAtWord: (self pointerForOop: obj)) ~= 0]) ifTrue: [coInterpreter print: 'leak in free chunk '; printHex: obj; print: ' @ '; printNum: fi; print: ' = '; printHex: fieldOop; print: ' is mapped'; cr. self eek. ok := false].]]] ifFalse: [containsYoung := false. (self isRemembered: obj) ifTrue: [numRememberedObjectsInHeap := numRememberedObjectsInHeap + 1. (scavenger isInRememberedSet: obj) ifFalse: [coInterpreter print: 'remembered object '; printHex: obj; print: ' is not in remembered table'; cr. self eek. ok := false]]. (self isForwarded: obj) ifTrue: [fieldOop := self fetchPointer: 0 ofMaybeForwardedObject: obj. (heapMap heapMapAtWord: (self pointerForOop: fieldOop)) = 0 ifTrue: [coInterpreter print: 'object leak in forwarder '; printHex: obj; print: ' to unmapped '; printHex: fieldOop; cr. self eek. ok := false]. (self isReallyYoung: fieldOop) ifTrue: [containsYoung := true]] ifFalse: [classOop := self classOrNilAtIndex: (classIndex := self classIndexOf: obj). (classIndicesShouldBeValid and: [classOop = nilObj and: [classIndex > self lastClassIndexPun]]) ifTrue: [coInterpreter print: 'object leak in '; printHex: obj; print: ' invalid class index '; printHex: classIndex; print: ' -> '; print: (classOop ifNil: ['nil'] ifNotNil: ['nilObj']); cr. self eek. ok := false]. 0 to: (self numPointerSlotsOf: obj) - 1 do: [:fi| fieldOop := self fetchPointer: fi ofObject: obj. (self isNonImmediate: fieldOop) ifTrue: [(heapMap heapMapAtWord: (self pointerForOop: fieldOop)) = 0 ifTrue: [coInterpreter print: 'object leak in '; printHex: obj; print: ' @ '; printNum: fi; print: ' = '; printHex: fieldOop; cr. self eek. ok := false]. "don't be misled by CogMethods; they appear to be young, but they're not" (self isReallyYoung: fieldOop) ifTrue: [containsYoung := true]]]]. containsYoung ifTrue: [(self isRemembered: obj) ifFalse: [coInterpreter print: 'unremembered object '; printHex: obj; print: ' contains young oop(s)'; cr. self eek. ok := false]]]]. numRememberedObjectsInHeap ~= scavenger rememberedSetSize ifTrue: [coInterpreter print: 'root count mismatch. #heap roots '; printNum: numRememberedObjectsInHeap; print: '; #roots '; printNum: scavenger rememberedSetSize; cr. self eek. "But the system copes with overflow..." self flag: 'no support for remembered set overflow yet'. "ok := rootTableOverflowed and: [needGCFlag]"]. scavenger rememberedSetWithIndexDo: [:obj :i| (obj bitAnd: self wordSize - 1) ~= 0 ifTrue: [coInterpreter print: 'misaligned oop in remembered set @ '; printNum: i; print: ' = '; printHex: obj; cr. self eek. ok := false] ifFalse: [(heapMap heapMapAtWord: (self pointerForOop: obj)) = 0 ifTrue: [coInterpreter print: 'object leak in remembered set @ '; printNum: i; print: ' = '; printHex: obj; cr. self eek. ok := false] ifFalse: [(self isYoung: obj) ifTrue: [coInterpreter print: 'non-root in remembered set @ '; printNum: i; print: ' = '; printHex: obj; cr. self eek. ok := false]]]]. + self objStack: mournQueue do: + [:i :page| | obj | + obj := self fetchPointer: i ofObject: page. + (obj bitAnd: self wordSize - 1) ~= 0 + ifTrue: + [coInterpreter print: 'misaligned oop in mournQueue @ '; printNum: i; print: ' in '; printHex: page; print: ' = '; printHex: obj; cr. + self eek. + ok := false] + ifFalse: + [(excludeUnmarkedNewSpaceObjs and: [(self isYoung: obj) and: [(self isMarked: obj) not]]) ifFalse: + [(heapMap heapMapAtWord: (self pointerForOop: obj)) = 0 ifTrue: + [coInterpreter print: 'object leak in mournQueue @ '; printNum: i; print: ' in '; printHex: page; print: ' = '; printHex: obj; cr. + self eek. + ok := false]]]]. 1 to: remapBufferCount do: [:ri| | obj | obj := remapBuffer at: ri. (obj bitAnd: self wordSize - 1) ~= 0 ifTrue: [coInterpreter print: 'misaligned remapRoot @ '; printNum: ri; print: ' = '; printHex: obj; cr. self eek. ok := false] ifFalse: [(heapMap heapMapAtWord: (self pointerForOop: obj)) = 0 ifTrue: [coInterpreter print: 'object leak in remapRoots @ '; printNum: ri; print: ' = '; printHex: obj; cr. self eek. ok := false]]]. 1 to: extraRootCount do: [:ri| | obj | obj := (extraRoots at: ri) at: 0. (obj bitAnd: self wordSize - 1) ~= 0 ifTrue: [coInterpreter print: 'misaligned extraRoot @ '; printNum: ri; print: ' => '; printHex: obj; cr. self eek. ok := false] ifFalse: [(heapMap heapMapAtWord: (self pointerForOop: obj)) = 0 ifTrue: [coInterpreter print: 'object leak in extraRoots @ '; printNum: ri; print: ' => '; printHex: obj; cr. self eek. ok := false]]]. ^ok! Item was added: + ----- Method: SpurMemoryManager>>mapMournQueue (in category 'weakness and ephemerality') ----- + mapMournQueue + <inline: #never> + self objStack: mournQueue do: + [:i :page| | mourner | + mourner := self fetchPointer: i ofObject: page. + (self isNonImmediate: mourner) ifTrue: "someone could try and become weaklings into immediates..." + [(self isForwarded: mourner) ifTrue: + [mourner := self followForwarded: mourner]. + (scavenger isScavengeSurvivor: mourner) ifFalse: + [mourner := scavenger copyAndForwardMourner: mourner]. + "we could check for change but writes are cheasp with write buffers..." + self storePointerUnchecked: i ofObject: page withValue: mourner]]! Item was added: + ----- Method: SpurMemoryManager>>objStack:do: (in category 'obj stacks') ----- + objStack: objStack do: aBlock + "Evaluate aBinaryBlock with all indices and pages of elements in objStack" + <inline: true> + | objStackPage | + objStack = nilObj ifTrue: + [^self]. + self eassert: [self isValidObjStack: objStack]. + objStackPage := objStack. + [objStackPage ~= 0] whileTrue: + [| numOnThisPage | + numOnThisPage := self fetchPointer: ObjStackTopx ofObject: objStackPage. + numOnThisPage + ObjStackFixedSlots - 1 to: ObjStackFixedSlots by: -1 do: + [:i| aBlock value: i value: objStackPage]. + objStackPage := self fetchPointer: ObjStackNextx ofObject: objStackPage]! Item was changed: ----- Method: SpurMemoryManager>>queueMourner: (in category 'weakness and ephemerality') ----- queueMourner: anEphemeronOrWeakArray "Add the ephemeron to the queue and make it non-ephemeral, to avoid subsequent firing. Alas this means that other ephemerons on the same object not identified in this sccavenge or GC will not fire until later. But that's life." self assert: ((self isNonImmediate: anEphemeronOrWeakArray) and: [(self formatOf: anEphemeronOrWeakArray) = self ephemeronFormat or: [(self formatOf: anEphemeronOrWeakArray) = self weakArrayFormat]]). + self deny: ((self formatOf: anEphemeronOrWeakArray) = self ephemeronFormat + and: [self is: anEphemeronOrWeakArray onObjStack: mournQueue]). - self deny: (self is: anEphemeronOrWeakArray onObjStack: mournQueue). self ensureRoomOnObjStackAt: MournQueueRootIndex. self push: anEphemeronOrWeakArray onObjStack: mournQueue! Item was changed: ----- Method: StackInterpreter>>fireEphemeron: (in category 'finalization') ----- fireEphemeron: ephemeron <option: #SpurObjectMemory> + objectMemory + queueMourner: ephemeron; + setFormatOf: ephemeron to: objectMemory nonIndexablePointerFormat. - objectMemory queueMourner: ephemeron.. - self setFormatOf: ephemeron to: self nonIndexablePointerFormat. self signalFinalization: ephemeron!

1 0

Re: [Vm-dev] VM Maker: VMMaker.oscog-EstebanLorenzano.1869.mcz
by Eliot Miranda 26 May '16

26 May '16

Hi Esteban, yes, sorry about that. I didn't notice until just now. I've fixed it properly, so will skip your commit. Forgive me. On Thu, May 26, 2016 at 4:51 AM, <commits(a)source.squeak.org> wrote: > > Esteban Lorenzano uploaded a new version of VMMaker to project VM Maker: > http://source.squeak.org/VMMaker/VMMaker.oscog-EstebanLorenzano.1869.mcz > > ==================== Summary ==================== > > Name: VMMaker.oscog-EstebanLorenzano.1869 > Author: EstebanLorenzano > Time: 26 May 2016, 1:49:23.32419 pm > UUID: 6ccd2249-0a2c-4279-90b4-861c39f29859 > Ancestors: VMMaker.oscog-eem.1868 > > last change breaks cCode: '' (strings). > this commit fixes some, but not all... I don't know what to do with this > (from UnixOSProcessPlugin): > > self cCode: 'sigchldHandlerAction.sa_sigaction = reapChildProcess' > > (that dot there...) > > > =============== Diff against VMMaker.oscog-eem.1868 =============== > > Item was changed: > ----- Method: FloatArrayPlugin>>primitiveLength (in category 'arithmetic > primitives') ----- > primitiveLength > > "Primitive. Compute the length of the argument (sqrt of sum of > component squares)." > > | rcvr rcvrPtr length result | > <export: true> > <var: #rcvrPtr type:'float *'> > <var: #result type:'double '> > rcvr := interpreterProxy stackObjectValue: 0. > interpreterProxy failed ifTrue:[^nil]. > interpreterProxy success: (interpreterProxy isWords: rcvr). > interpreterProxy failed ifTrue:[^nil]. > length := interpreterProxy stSizeOf: rcvr. > interpreterProxy success: true. > rcvrPtr := self cCoerce: (interpreterProxy firstIndexableField: > rcvr) to: 'float *'. > result := 0.0. > 0 to: length-1 do:[:i| > result := result + ((self cCoerce: (rcvrPtr at: i) to: > 'double') * (self cCoerce: (rcvrPtr at: i) to: 'double')). > ]. > + result := self cCode: [self sqrt:result] inSmalltalk: [result > sqrt]. > - result := self cCode: 'sqrt(result)' inSmalltalk: [result sqrt]. > interpreterProxy pop: 1 thenPush: (interpreterProxy floatObjectOf: > result)! > > Item was changed: > ----- Method: FloatArrayPlugin>>primitiveNormalize (in category > 'arithmetic primitives') ----- > primitiveNormalize > > "Primitive. Normalize the argument (A FloatArray) in place." > > | rcvr rcvrPtr length len | > <export: true> > <var: #rcvrPtr type:'float *'> > <var: #len type:'double '> > rcvr := interpreterProxy stackObjectValue: 0. > interpreterProxy failed ifTrue:[^nil]. > interpreterProxy success: (interpreterProxy isWords: rcvr). > interpreterProxy failed ifTrue:[^nil]. > length := interpreterProxy stSizeOf: rcvr. > interpreterProxy success: true. > rcvrPtr := self cCoerce: (interpreterProxy firstIndexableField: > rcvr) to: 'float *'. > len := 0.0. > 0 to: length-1 do:[:i| > len := len + ((self cCoerce: (rcvrPtr at: i) to: 'double') > * (self cCoerce: (rcvrPtr at: i) to: 'double')). > ]. > interpreterProxy success: (len > 0.0). > interpreterProxy failed ifTrue:[^nil]. > > + len := self cCode: [self sqrt:len] inSmalltalk: [len sqrt]. > - len := self cCode: 'sqrt(len)' inSmalltalk: [len sqrt]. > 0 to: length-1 do:[:i| > rcvrPtr at: i put: ((self cCoerce: (rcvrPtr at: i) to: > 'double') / len). > ]. > > "Leave receiver on the stack."! > > Item was changed: > ----- Method: SoundPlugin>>primitiveSoundGetRecordingSampleRate (in > category 'primitives') ----- > primitiveSoundGetRecordingSampleRate > "Return a float representing the actual sampling rate during > recording. Fail if not currently recording." > > | rate | > <var: #rate type: 'double '> > self primitive: 'primitiveSoundGetRecordingSampleRate'. > + rate := self snd_GetRecordingSampleRate. "fail if not recording" > - rate := self cCode: 'snd_GetRecordingSampleRate()'. "fail if not > recording" > ^rate asFloatObj! > > -- _,,,^..^,,,_ best, Eliot

1 0

Re: [Vm-dev] VM Maker: VMMaker.oscog-EstebanLorenzano.1869.mcz
by Levente Uzonyi 26 May '16

26 May '16

On Thu, 26 May 2016, commits(a)source.squeak.org wrote: > > Esteban Lorenzano uploaded a new version of VMMaker to project VM Maker: > http://source.squeak.org/VMMaker/VMMaker.oscog-EstebanLorenzano.1869.mcz > > ==================== Summary ==================== > > Name: VMMaker.oscog-EstebanLorenzano.1869 > Author: EstebanLorenzano > Time: 26 May 2016, 1:49:23.32419 pm > UUID: 6ccd2249-0a2c-4279-90b4-861c39f29859 > Ancestors: VMMaker.oscog-eem.1868 > > last change breaks cCode: '' (strings). > this commit fixes some, but not all... I don't know what to do with this (from UnixOSProcessPlugin): > > self cCode: 'sigchldHandlerAction.sa_sigaction = reapChildProcess' > > (that dot there...) > > > =============== Diff against VMMaker.oscog-eem.1868 =============== > snip > Item was changed: > ----- Method: SoundPlugin>>primitiveSoundGetRecordingSampleRate (in category 'primitives') ----- > primitiveSoundGetRecordingSampleRate > "Return a float representing the actual sampling rate during recording. Fail if not currently recording." > > | rate | > <var: #rate type: 'double '> > self primitive: 'primitiveSoundGetRecordingSampleRate'. > + rate := self snd_GetRecordingSampleRate. "fail if not recording" > - rate := self cCode: 'snd_GetRecordingSampleRate()'. "fail if not recording" Are we okay with selectors containing underscores in the VMMaker package? If I'm not mistaken, this is the first such method. Levente > ^rate asFloatObj! > >

3 2

← Newer
1
2
3
4
5
6
7
...
15
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 May 2016