Vm-dev December 2016

vm-dev@lists.squeakfoundation.org

34 participants
102 discussions

Re: [Vm-dev] [squeak-dev] managing the transition to 64-bit
by Eliot Miranda 13 Dec '16

13 Dec '16

Hi Chris, > On Dec 12, 2016, at 3:43 PM, Ben Coman <btc(a)openinworld.com> wrote: > > > >> On Tue, Dec 13, 2016 at 3:34 AM, Chris Muller <asqueaker(a)gmail.com> wrote: >> I'm saying that the traditional way of installing a global VM, by installing under /usr/local, cannot support dual 32 and 64-bit installation because the directory name under "lib" is exactly the same for both platforms. >> >> Installing from cog_linux32x86_squeak.cog.spur_201608171728.tar.gz: >> >> /./products/cogspurlinuxht/lib/squeak/5.0-201608171728/squeak "32-bit" >> >> and from cog_linux64x64_squeak.cog.spur_201608171728.tar.gz: >> >> /./products/cogspur64linuxht/lib/squeak/5.0-201608171728/squeak "64-bit!" >> >> copying from the highlighted, down, to the traditional /usr/local location makes that conflict. I like any of the following: /usr/local/squeak/{lib,lib64}/squeak/5.x-20yymmddhhmm/ /usr/local/squeak/{lib32,lib}/squeak/5.x-20yymmddhhmm/ /usr/local/squeak/{lib32,lib64}/squeak/5.x-20yymmddhhmm/ and then have /usr/local/squeak/squeak & /usr/local/squeak/bin/squeak determine which lib dir to use based on e.g. the od program, or possibly hexdump. Does this make sense? >> >> I want to run the same version of each VM, so there will be no question if disparity's arise during testing. I'd like to have access to a global "spur" (32-bit) and "spur64" commands. Any advice for this Linux user is appreciated, thx.. > > But since gong forward there is likely more 64-bit installs than 32 bit, perhaps that should be spur32 & spur (64-bit)? > cheers -ben > > >> >>> On Mon, Dec 12, 2016 at 12:55 PM, Levente Uzonyi <leves(a)caesar.elte.hu> wrote: >>> Do you mean that you want to make a single executable to run both 32-bit and 64-bit images? >>> If so, you can make a script which reads the image version from the header and runs it with the corresponding VM. >>> But I don't see why you would want to do that. :) >>> >>> Levente >>> >>> >>> On Mon, 12 Dec 2016, Chris Muller wrote: >>> >>>> I'm ready to make a push to migrate all my stuff to 64-bit, so this >>>> means I need the ability to run either a 32-bit VM or a 64-bit VM, at >>>> least for now. Unfortunately, it appears each uses the same the VM >>>> file directory structure, and so whichever one is installed last >>>> stomps out the other. >>>> >>>> Eliot, you have unique names for VM versions, have you considered >>>> inserting something to uniquefy the names to support co-existence of >>>> 32 and 64-bit of the same VM version? Or, does anyone have any best >>>> practices to allow the co-existence of 32-bit with 64-bit VM? >>>> >>>> I'm not talking about the problem with the names of the executables >>>> (scripts) all being "squeak". I've already been renaming the shell >>>> scripts from "squeak" to "cog" or "spur". Now the problem between 32 >>>> and 64-bit is the "lib" directory they refer to -- they share the >>>> exact same name. >>>> >>>> I still have a lot of 32-bit images around. Does anyone have any >>>> pointers on how best to manage both a 32-bit and 64-bit?

2 1

VM Maker: VMMaker.oscog-eem.2037.mcz
by commits＠source.squeak.org 12 Dec '16

12 Dec '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.2037.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.2037 Author: eem Time: 12 December 2016, 11:34:29.281549 am UUID: bf1aec4c-021e-42cc-b72a-0e329bf20287 Ancestors: VMMaker.oscog-eem.2036 SistaRegisterAllocatingCogit: Check-in the autogenerated code in SistaCogitClone. =============== Diff against VMMaker.oscog-eem.2036 =============== Item was added: + ----- Method: SistaCogitClone class>>additionalHeadersDo: (in category 'translation') ----- + additionalHeadersDo: aBinaryBlock + "Evaluate aBinaryBlock with the names and contents of + any additional header files that need to be generated." + aBinaryBlock + value: 'cogmethod.h' + value: SistaCogMethod cogMethodHeader! Item was added: + ----- Method: SistaCogitClone class>>ancilliaryClasses: (in category 'translation') ----- + ancilliaryClasses: options + ^(super ancilliaryClasses: options) copyWith: SistaCogMethod! Item was added: + ----- Method: SistaCogitClone class>>declareCVarsIn: (in category 'translation') ----- + declareCVarsIn: aCodeGen + aCodeGen var: 'counters' type: #usqInt! Item was added: + ----- Method: SistaCogitClone class>>initializeWithOptions: (in category 'class initialization') ----- + initializeWithOptions: optionsDictionary + + super initializeWithOptions: optionsDictionary. + CounterBytes := 4. + MaxCounterValue := (1 << 16) - 1! Item was added: + ----- Method: SistaCogitClone class>>numTrampolines (in category 'accessing') ----- + numTrampolines + ^super numTrampolines + 1 + + "Cogit withAllSubclasses collect: [:c| {c. (c instVarNames select: [:ea| ea beginsWith: 'ce']) size}]" + "self instVarNames select: [:ea| ea beginsWith: 'ce']"! Item was added: + ----- Method: SistaCogitClone>>allowEarlyOpenPICPromotion (in category 'in-line cacheing') ----- + allowEarlyOpenPICPromotion + <inline: true> + ^ false! Item was added: + ----- Method: SistaCogitClone>>compileCogFullBlockMethod: (in category 'compile abstract instructions') ----- + compileCogFullBlockMethod: numCopied + <option: #SistaV1BytecodeSet> + counters := 0. + ^super compileCogFullBlockMethod: numCopied! Item was added: + ----- Method: SistaCogitClone>>compileCogMethod: (in category 'compile abstract instructions') ----- + compileCogMethod: selector + counters := 0. + ^super compileCogMethod: selector! Item was added: + ----- Method: SistaCogitClone>>compileFrameBuild (in category 'compile abstract instructions') ----- + compileFrameBuild + "Override to prefetch counters, if any." + super compileFrameBuild. + counters ~= 0 ifTrue: + [self PrefetchAw: counters]! Item was added: + ----- Method: SistaCogitClone>>compileFullBlockMethodFrameBuild: (in category 'compile abstract instructions') ----- + compileFullBlockMethodFrameBuild: numCopied + "Override to prefetch counters if any" + super compileFullBlockMethodFrameBuild: numCopied. + counters ~= 0 ifTrue: + [self PrefetchAw: counters]! Item was added: + ----- Method: SistaCogitClone>>disassembleMethod:on: (in category 'disassembly') ----- + disassembleMethod: surrogateOrAddress on: aStream + <doNotGenerate> + | cogMethod | + cogMethod := super disassembleMethod: surrogateOrAddress on: aStream. + (cogMethod cmType = CMMethod + and: [cogMethod counters ~= 0]) ifTrue: + [aStream nextPutAll: 'counters:'; cr. + numCounters := objectRepresentation numCountersFor: counters. + 0 to: numCounters - 1 do: + [:i| | addr | + addr := i * CounterBytes + counters. + addr printOn: aStream base: 16. + aStream nextPut: $:; space. + (objectMemory long32At: addr) printOn: aStream base: 16. + aStream cr]. + aStream flush]! Item was added: + ----- Method: SistaCogitClone>>estimateOfAbstractOpcodesPerBytecodes (in category 'accessing') ----- + estimateOfAbstractOpcodesPerBytecodes + "Due to the counter logic, the estimation is higher" + <inline: true> + ^ 11! Item was added: + ----- Method: SistaCogitClone>>fillInCPICHeader:numArgs:numCases:hasMNUCase:selector: (in category 'generate machine code') ----- + fillInCPICHeader: pic numArgs: numArgs numCases: numCases hasMNUCase: hasMNUCase selector: selector + pic counters: 0. + ^super fillInCPICHeader: pic numArgs: numArgs numCases: numCases hasMNUCase: hasMNUCase selector: selector! Item was added: + ----- Method: SistaCogitClone>>fillInCounters:atEndAddress: (in category 'generate machine code') ----- + fillInCounters: nCounters atEndAddress: endAddress + endAddress - (nCounters * CounterBytes) + to: endAddress - CounterBytes + by: CounterBytes + do: [:address| + objectMemory + long32At: address + put: (initialCounterValue << 16 + initialCounterValue)]! Item was added: + ----- Method: SistaCogitClone>>fillInCounters:atStartAddress: (in category 'generate machine code') ----- + fillInCounters: nCounters atStartAddress: startAddress + startAddress + to: startAddress + (nCounters - 1 * CounterBytes) + by: CounterBytes + do: [:address| + objectMemory + long32At: address + put: (initialCounterValue << 16 + initialCounterValue)]! Item was added: + ----- Method: SistaCogitClone>>fillInMethodHeader:size:selector: (in category 'generate machine code') ----- + fillInMethodHeader: method size: size selector: selector + super fillInMethodHeader: method size: size selector: selector. + self fillInCounters: numCounters atStartAddress: counters. + method counters: counters. + ^method! Item was added: + ----- Method: SistaCogitClone>>fillInOPICHeader:numArgs:selector: (in category 'generate machine code') ----- + fillInOPICHeader: pic numArgs: numArgs selector: selector + pic counters: 0. + ^super fillInOPICHeader: pic numArgs: numArgs selector: selector! Item was added: + ----- Method: SistaCogitClone>>genBinaryConstOpVarInlinePrimitive: (in category 'inline primitive generators') ----- + genBinaryConstOpVarInlinePrimitive: prim + "Const op var version of binary inline primitives." + "SistaV1: 248 11111000 iiiiiiii mjjjjjjj Call Primitive #iiiiiiii + (jjjjjjj * 256) m=1 means inlined primitive, no hard return after execution. + See EncoderForSistaV1's class comment and StackInterpreter>>#binaryInlinePrimitive:" + <option: #SistaVM> + | ra val untaggedVal adjust | + ra := self allocateRegForStackEntryAt: 0. + self ssTop popToReg: ra. + self ssPop: 1. + val := self ssTop constant. + self ssPop: 1. + untaggedVal := val - objectMemory smallIntegerTag. + prim caseOf: { + "0 through 6, +, -, *, /, //, \\, quo:, SmallInteger op SmallInteger => SmallInteger, no overflow" + [0] -> [self AddCq: untaggedVal R: ra]. + [1] -> [self MoveCq: val R: TempReg. + self SubR: ra R: TempReg. + objectRepresentation genAddSmallIntegerTagsTo: TempReg. + self MoveR: TempReg R: ra]. + [2] -> [objectRepresentation genShiftAwaySmallIntegerTagsInScratchReg: ra. + self MoveCq: untaggedVal R: TempReg. + self MulR: TempReg R: ra. + objectRepresentation genSetSmallIntegerTagsIn: ra]. + + "2016 through 2019, bitAnd:, bitOr:, bitXor, bitShift:, SmallInteger op SmallInteger => SmallInteger, no overflow" + [16] -> [ self AndCq: val R: ra ]. + [17] -> [ self OrCq: val R: ra ]. + [18] -> [ self XorCw: untaggedVal R: ra. ]. + + "2032 through 2037, >, <, >=, <=. =, ~=, SmallInteger op SmallInteger => Boolean (flags?? then in jump bytecodes if ssTop is a flags value, just generate the instruction!!!!)" + "CmpCqR is SubRCq so everything is reversed, but because no CmpRCq things are reversed again and we invert the sense of the jumps." + [32] -> [ self CmpCq: val R: ra. + self genBinaryInlineComparison: JumpLess opFalse: JumpGreaterOrEqual destReg: ra ]. + [33] -> [ self CmpCq: val R: ra. + self genBinaryInlineComparison: JumpGreater opFalse: JumpLessOrEqual destReg: ra ]. + [34] -> [ self CmpCq: val R: ra. + self genBinaryInlineComparison: JumpLessOrEqual opFalse: JumpGreater destReg: ra ]. + [35] -> [ self CmpCq: val R: ra. + self genBinaryInlineComparison: JumpGreaterOrEqual opFalse: JumpLess destReg: ra ]. + [36] -> [ self CmpCq: val R: ra. + self genBinaryInlineComparison: JumpZero opFalse: JumpNonZero destReg: ra ]. + [37] -> [ self CmpCq: val R: ra. + self genBinaryInlineComparison: JumpNonZero opFalse: JumpZero destReg: ra ]. + + "2064 through 2068, Pointer Object>>at:, Byte Object>>at:, Short16 Word Object>>at: LongWord32 Object>>at: Quad64Word Object>>at:. obj op 0-rel SmallInteger => oop" + [64] -> [objectRepresentation genConvertSmallIntegerToIntegerInReg: ra. + adjust := (objectMemory baseHeaderSize >> objectMemory shiftForWord) - 1. "shift by baseHeaderSize and then move from 1 relative to zero relative" + adjust ~= 0 ifTrue: [ self AddCq: adjust R: ra. ]. + self genMoveConstant: val R: TempReg. + self MoveXwr: ra R: TempReg R: ra]. + [65] -> [objectRepresentation genConvertSmallIntegerToIntegerInReg: ra. + adjust := objectMemory baseHeaderSize - 1. "shift by baseHeaderSize and then move from 1 relative to zero relative" + self AddCq: adjust R: ra. + self genMoveConstant: val R: TempReg. + self MoveXbr: ra R: TempReg R: ra. + objectRepresentation genConvertIntegerToSmallIntegerInReg: ra] + } + otherwise: [^EncounteredUnknownBytecode]. + self ssPushRegister: ra. + ^0! Item was added: + ----- Method: SistaCogitClone>>genBinaryInlineComparison:opFalse:destReg: (in category 'inline primitive generators') ----- + genBinaryInlineComparison: opTrue opFalse: opFalse destReg: destReg + "Inlined comparison. opTrue = jump for true and opFalse = jump for false" + <var: #branchDescriptor type: #'BytecodeDescriptor *'> + | nextPC branchDescriptor targetBytecodePC postBranchPC | + + self extractMaybeBranchDescriptorInto: [ :descr :next :postBranch :target | + branchDescriptor := descr. nextPC := next. postBranchPC := postBranch. targetBytecodePC := target ]. + + (branchDescriptor isBranchTrue or: [branchDescriptor isBranchFalse]) + ifTrue: "This is the path where the inlined comparison is followed immediately by a branch" + [ (self fixupAt: nextPC - initialPC) notAFixup + ifTrue: "The next instruction is dead. we can skip it." + [deadCode := true. + self ensureFixupAt: targetBytecodePC - initialPC. + self ensureFixupAt: postBranchPC - initialPC ] + ifFalse: + [self ssPushConstant: objectMemory trueObject]. "dummy value" + self genConditionalBranch: (branchDescriptor isBranchTrue ifTrue: [opTrue] ifFalse: [opFalse]) + operand: (self ensureNonMergeFixupAt: targetBytecodePC - initialPC) asUnsignedInteger. + deadCode ifFalse: [ self Jump: (self ensureNonMergeFixupAt: postBranchPC - initialPC) ] ] + ifFalse: "This is the path where the inlined comparison is *not* followed immediately by a branch" + [| condJump jump | + condJump := self genConditionalBranch: opTrue operand: 0. + self genMoveFalseR: destReg. + jump := self Jump: 0. + condJump jmpTarget: (self genMoveTrueR: destReg). + jump jmpTarget: self Label]. + ^ 0! Item was added: + ----- Method: SistaCogitClone>>genBinaryVarOpConstInlinePrimitive: (in category 'inline primitive generators') ----- + genBinaryVarOpConstInlinePrimitive: prim + "Var op const version of inline binary inline primitives." + "SistaV1: 248 11111000 iiiiiiii mjjjjjjj Call Primitive #iiiiiiii + (jjjjjjj * 256) m=1 means inlined primitive, no hard return after execution. + See EncoderForSistaV1's class comment and StackInterpreter>>#binaryInlinePrimitive:" + <option: #SistaVM> + | rr val untaggedVal | + val := self ssTop constant. + self ssPop: 1. + rr := self allocateRegForStackEntryAt: 0. + self ssTop popToReg: rr. + self ssPop: 1. + untaggedVal := val - objectMemory smallIntegerTag. + prim caseOf: { + "0 through 6, +, -, *, /, //, \\, quo:, SmallInteger op SmallInteger => SmallInteger, no overflow" + [0] -> [self AddCq: untaggedVal R: rr]. + [1] -> [self SubCq: untaggedVal R: rr ]. + [2] -> [self flag: 'could use MulCq:R'. + objectRepresentation genShiftAwaySmallIntegerTagsInScratchReg: rr. + self MoveCq: untaggedVal R: TempReg. + self MulR: TempReg R: rr. + objectRepresentation genSetSmallIntegerTagsIn: rr]. + + "2016 through 2019, bitAnd:, bitOr:, bitXor, bitShift:, SmallInteger op SmallInteger => SmallInteger, no overflow" + [16] -> [ self AndCq: val R: rr ]. + [17] -> [ self OrCq: val R: rr ]. + [18] -> [ self flag: 'could use XorCq:'. + self XorCw: untaggedVal R: rr. ]. + + "2032 through 2037, >, <, >=, <=. =, ~=, SmallInteger op SmallInteger => Boolean (flags?? then in jump bytecodes if ssTop is a flags value, just generate the instruction!!!!)" + "CmpCqR is SubRCq so everything is reversed." + [32] -> [ self CmpCq: val R: rr. + self genBinaryInlineComparison: JumpGreater opFalse: JumpLessOrEqual destReg: rr ]. + [33] -> [ self CmpCq: val R: rr. + self genBinaryInlineComparison: JumpLess opFalse: JumpGreaterOrEqual destReg: rr ]. + [34] -> [ self CmpCq: val R: rr. + self genBinaryInlineComparison: JumpGreaterOrEqual opFalse: JumpLess destReg: rr ]. + [35] -> [ self CmpCq: val R: rr. + self genBinaryInlineComparison: JumpLessOrEqual opFalse: JumpGreater destReg: rr ]. + [36] -> [ self CmpCq: val R: rr. + self genBinaryInlineComparison: JumpZero opFalse: JumpNonZero destReg: rr ]. + [37] -> [ self CmpCq: val R: rr. + self genBinaryInlineComparison: JumpNonZero opFalse: JumpZero destReg: rr ]. + + "2064 through 2068, Pointer Object>>at:, Byte Object>>at:, Short16 Word Object>>at: LongWord32 Object>>at: Quad64Word Object>>at:. obj op 0-rel SmallInteger => oop" + [64] -> [objectRepresentation genLoadSlot: (objectMemory integerValueOf: val) - 1 sourceReg: rr destReg: rr]. + [65] -> [self MoveCq: (objectMemory integerValueOf: val) + objectMemory baseHeaderSize - 1 R: TempReg. + self MoveXbr: TempReg R: rr R: rr. + objectRepresentation genConvertIntegerToSmallIntegerInReg: rr] + + } + otherwise: [^EncounteredUnknownBytecode]. + self ssPushRegister: rr. + ^0! Item was added: + ----- Method: SistaCogitClone>>genBinaryVarOpVarInlinePrimitive: (in category 'inline primitive generators') ----- + genBinaryVarOpVarInlinePrimitive: prim + "Var op var version of binary inline primitives." + "SistaV1: 248 11111000 iiiiiiii mjjjjjjj Call Primitive #iiiiiiii + (jjjjjjj * 256) m=1 means inlined primitive, no hard return after execution. + See EncoderForSistaV1's class comment and StackInterpreter>>#binaryInlinePrimitive:" + <option: #SistaVM> + | ra rr adjust | + self allocateRegForStackTopTwoEntriesInto: [:rTop :rNext | ra := rTop. rr := rNext ]. + self ssTop popToReg: ra. + self ssPop: 1. + self ssTop popToReg: rr. + self ssPop: 1. + prim caseOf: { + "0 through 6, +, -, *, /, //, \\, quo:, SmallInteger op SmallInteger => SmallInteger, no overflow" + [0] -> [objectRepresentation genRemoveSmallIntegerTagsInScratchReg: ra. + self AddR: ra R: rr]. + [1] -> [self SubR: ra R: rr. + objectRepresentation genAddSmallIntegerTagsTo: rr]. + [2] -> [self genShiftAwaySmallIntegerTagsInScratchReg: rr. + self genRemoveSmallIntegerTagsInScratchReg: ra. + self MulR: ra R: rr. + self genSetSmallIntegerTagsIn: rr]. + + "2016 through 2019, bitAnd:, bitOr:, bitXor, bitShift:, SmallInteger op SmallInteger => SmallInteger, no overflow" + [16] -> [ self AndR: ra R: rr ]. + [17] -> [ self OrR: ra R: rr ]. + [18] -> [objectRepresentation genRemoveSmallIntegerTagsInScratchReg: ra. + self XorR: ra R: rr. ]. + + + "2032 through 2037, >, <, >=, <=. =, ~=, SmallInteger op SmallInteger => Boolean (flags?? then in jump bytecodes if ssTop is a flags value, just generate the instruction!!!!)" + "CmpCqR is SubRCq so everything is reversed." + [32] -> [ self CmpR: ra R: rr. + self genBinaryInlineComparison: JumpGreater opFalse: JumpLessOrEqual destReg: rr ]. + [33] -> [ self CmpR: ra R: rr. + self genBinaryInlineComparison: JumpLess opFalse: JumpGreaterOrEqual destReg: rr ]. + [34] -> [ self CmpR: ra R: rr. + self genBinaryInlineComparison: JumpGreaterOrEqual opFalse: JumpLess destReg: rr ]. + [35] -> [ self CmpR: ra R: rr. + self genBinaryInlineComparison: JumpLessOrEqual opFalse: JumpGreater destReg: rr ]. + [36] -> [ self CmpR: ra R: rr. + self genBinaryInlineComparison: JumpZero opFalse: JumpNonZero destReg: rr ]. + [37] -> [ self CmpR: ra R: rr. + self genBinaryInlineComparison: JumpNonZero opFalse: JumpZero destReg: rr ]. + + "2064 through 2068, Pointer Object>>at:, Byte Object>>at:, Short16 Word Object>>at: LongWord32 Object>>at: Quad64Word Object>>at:. obj op 0-rel SmallInteger => oop" + [64] -> [objectRepresentation genConvertSmallIntegerToIntegerInReg: ra. + adjust := (objectMemory baseHeaderSize >> objectMemory shiftForWord) - 1. "shift by baseHeaderSize and then move from 1 relative to zero relative" + adjust ~= 0 ifTrue: [ self AddCq: adjust R: ra. ]. + self MoveXwr: ra R: rr R: rr ]. + [65] -> [objectRepresentation genConvertSmallIntegerToIntegerInReg: ra. + adjust := objectMemory baseHeaderSize - 1. "shift by baseHeaderSize and then move from 1 relative to zero relative" + self AddCq: adjust R: ra. + self MoveXbr: ra R: rr R: rr. + objectRepresentation genConvertIntegerToSmallIntegerInReg: rr] + + } + otherwise: [^EncounteredUnknownBytecode]. + self ssPushRegister: rr. + ^0! Item was added: + ----- Method: SistaCogitClone>>genCallPrimitiveBytecode (in category 'bytecode generators') ----- + genCallPrimitiveBytecode + "SistaV1: 248 11111000 iiiiiiii mjjjjjjj Call Primitive #iiiiiiii + (jjjjjjj * 256) m=1 means inlined primitive, no hard return after execution. + See EncoderForSistaV1's class comment and StackInterpreter>>#inlinePrimitiveBytecode:" + | prim | + byte2 < 128 ifTrue: + [^bytecodePC = initialPC + ifTrue: [0] + ifFalse: [EncounteredUnknownBytecode]]. + prim := byte2 - 128 << 8 + byte1. + + prim < 1000 ifTrue: + [^self genNullaryInlinePrimitive: prim]. + + prim < 2000 ifTrue: + [^self genUnaryInlinePrimitive: prim - 1000]. + + prim < 3000 ifTrue: + [self ssTop type = SSConstant ifTrue: + [^self genBinaryVarOpConstInlinePrimitive: prim - 2000]. + (self ssValue: 1) type = SSConstant ifTrue: + [^self genBinaryConstOpVarInlinePrimitive: prim - 2000]. + ^self genBinaryVarOpVarInlinePrimitive: prim - 2000]. + + prim < 4000 ifTrue: + [^self genTrinaryInlinePrimitive: prim - 3000]. + + ^EncounteredUnknownBytecode! Item was added: + ----- Method: SistaCogitClone>>genCounterTripOnlyJumpIf:to: (in category 'bytecode generator support') ----- + genCounterTripOnlyJumpIf: boolean to: targetBytecodePC + "Specific version if the branch is only reached while falling through if the counter trips after an inlined #== branch. We do not regenerate the counter logic in this case to avoid 24 bytes instructions." + + <var: #ok type: #'AbstractInstruction *'> + <var: #mustBeBooleanTrampoline type: #'AbstractInstruction *'> + + | ok mustBeBooleanTrampoline | + + extA := 0. + + self ssFlushTo: simStackPtr - 1. + + self ssTop popToReg: TempReg. + + self ssPop: 1. + + counterIndex := counterIndex + 1. "counters are increased / decreased in the inlined branch" + + "We need SendNumArgsReg because of the mustBeBooleanTrampoline" + self ssAllocateRequiredReg: SendNumArgsReg. + self MoveCq: 1 R: SendNumArgsReg. + + "The first time this is reached, it calls necessarily the counter trip for the trampoline because SendNumArgsReg is non zero" + mustBeBooleanTrampoline := self CallRT: (boolean == objectMemory falseObject + ifTrue: [ceSendMustBeBooleanAddFalseTrampoline] + ifFalse: [ceSendMustBeBooleanAddTrueTrampoline]). + + self annotateBytecode: self Label. + + "Cunning trick by LPD. If true and false are contiguous subtract the smaller. + Correct result is either 0 or the distance between them. If result is not 0 or + their distance send mustBeBoolean." + self assert: (objectMemory objectAfter: objectMemory falseObject) = objectMemory trueObject. + self genSubConstant: boolean R: TempReg. + self JumpZero: (self ensureFixupAt: targetBytecodePC - initialPC). + + self CmpCq: (boolean == objectMemory falseObject + ifTrue: [objectMemory trueObject - objectMemory falseObject] + ifFalse: [objectMemory falseObject - objectMemory trueObject]) + R: TempReg. + + ok := self JumpZero: 0. + self MoveCq: 0 R: SendNumArgsReg. "if counterReg is 0 this is a mustBeBoolean, not a counter trip." + + self Jump: mustBeBooleanTrampoline. + + ok jmpTarget: self Label. + ^0! Item was added: + ----- Method: SistaCogitClone>>genExecutionCountLogicInto:counterReg: (in category 'bytecode generator support') ----- + genExecutionCountLogicInto: binaryBlock counterReg: counterReg + <var: #countTripped type: #'AbstractInstruction *'> + <inline: true> + | counterAddress countTripped | + counterAddress := counters + (CounterBytes * counterIndex). + self MoveA32: counterAddress R: counterReg. + self SubCq: 16r10000 R: counterReg. "Count executed" + "If counter trips simply abort the comparison continuing to the following + branch *without* writing back. A double decrement will not trip the second time." + countTripped := self JumpCarry: 0. + self MoveR: counterReg A32: counterAddress. "write back" + binaryBlock value: counterAddress value: countTripped! Item was added: + ----- Method: SistaCogitClone>>genExtJumpIfNotInstanceOfBehaviorsBytecode (in category 'bytecode generators') ----- + genExtJumpIfNotInstanceOfBehaviorsBytecode + "SistaV1: * 254 11111110 kkkkkkkk jjjjjjjj branch If Not Instance Of Behavior/Array Of Behavior kkkkkkkk (+ Extend A * 256, where Extend A >= 0) distance jjjjjjjj (+ Extend B * 256, where Extend B >= 0)" + + | reg literal distance targetFixUp inverse | + + "We loose the information of in which register is stack top + when jitting the branch target so we need to flush everything. + We could use a fixed register here...." + reg := self allocateRegForStackEntryAt: 0. + self ssTop popToReg: reg. + self ssFlushTo: simStackPtr. "flushed but the value is still in reg" + + self genPopStackBytecode. + + literal := self getLiteral: (extA * 256 + byte1). + extA := 0. + extB < 0 + ifTrue: [extB := extB + 128. inverse := true] + ifFalse: [inverse := false]. + distance := extB * 256 + byte2. + extB := 0. + + targetFixUp := self cCoerceSimple: (self ensureFixupAt: bytecodePC + 3 + distance - initialPC) to: #'AbstractInstruction *'. + inverse + ifFalse: + [(objectMemory isArrayNonImm: literal) + ifTrue: [objectRepresentation branchIf: reg notInstanceOfBehaviors: literal target: targetFixUp] + ifFalse: [objectRepresentation branchIf: reg notInstanceOfBehavior: literal target: targetFixUp] ] + ifTrue: + [(objectMemory isArrayNonImm: literal) + ifTrue: [objectRepresentation branchIf: reg instanceOfBehaviors: literal target: targetFixUp] + ifFalse: [objectRepresentation branchIf: reg instanceOfBehavior: literal target: targetFixUp]]. + + + + ^0! Item was added: + ----- Method: SistaCogitClone>>genFallsThroughCountLogicCounterReg:counterAddress: (in category 'bytecode generator support') ----- + genFallsThroughCountLogicCounterReg: counterReg counterAddress: counterAddress + <inline: true> + "Gen this when the branch has not been taken and forwarders have been followed." + self SubCq: 1 R: counterReg. "Count untaken" + self MoveR: counterReg A32: counterAddress. "write back"! Item was added: + ----- Method: SistaCogitClone>>genForwardersInlinedIdenticalOrNotIf: (in category 'bytecode generators') ----- + genForwardersInlinedIdenticalOrNotIf: orNot + "Override to count inlined branches if followed by a conditional branch. + We borrow the following conditional branch's counter and when about to + inline the comparison we decrement the counter (without writing it back) + and if it trips simply abort the inlining, falling back to the normal send which + will then continue to the conditional branch which will trip and enter the abort." + | nextPC postBranchPC targetBytecodePC branchDescriptor counterReg fixup jumpEqual jumpNotEqual + counterAddress countTripped unforwardArg unforwardRcvr argReg rcvrReg regMask | + <var: #fixup type: #'BytecodeFixup *'> + <var: #countTripped type: #'AbstractInstruction *'> + <var: #label type: #'AbstractInstruction *'> + <var: #branchDescriptor type: #'BytecodeDescriptor *'> + <var: #jumpEqual type: #'AbstractInstruction *'> + <var: #jumpNotEqual type: #'AbstractInstruction *'> + + ((coInterpreter isOptimizedMethod: methodObj) or: [needsFrame not]) ifTrue: + [^super genForwardersInlinedIdenticalOrNotIf: orNot]. + + regMask := 0. + + self extractMaybeBranchDescriptorInto: [ :descr :next :postBranch :target | + branchDescriptor := descr. nextPC := next. postBranchPC := postBranch. targetBytecodePC := target ]. + + unforwardRcvr := (objectRepresentation isUnannotatableConstant: (self ssValue: 1)) not. + unforwardArg := (objectRepresentation isUnannotatableConstant: self ssTop) not. + + "If an operand is an annotable constant, it may be forwarded, so we need to store it into a + register so the forwarder check can jump back to the comparison after unforwarding the constant. + However, if one of the operand is an unnanotable constant, does not allocate a register for it + (machine code will use operations on constants)." + rcvrReg:= argReg := NoReg. + self + allocateEqualsEqualsRegistersArgNeedsReg: unforwardArg + rcvrNeedsReg: unforwardRcvr + into: [ :rcvr :arg | rcvrReg:= rcvr. argReg := arg ]. + + argReg ~= NoReg ifTrue: [ regMask := self registerMaskFor: argReg ]. + rcvrReg ~= NoReg ifTrue: [ regMask := regMask bitOr: (self registerMaskFor: rcvrReg) ]. + + "Only interested in inlining if followed by a conditional branch." + (branchDescriptor isBranchTrue or: [branchDescriptor isBranchFalse]) ifFalse: + [^ self + genIdenticalNoBranchArgIsConstant: unforwardArg not + rcvrIsConstant: unforwardRcvr not + argReg: argReg + rcvrReg: rcvrReg + orNotIf: orNot]. + + "If branching the stack must be flushed for the merge" + self ssFlushTo: simStackPtr - 2. + + unforwardArg ifTrue: [ objectRepresentation genEnsureOopInRegNotForwarded: argReg scratchReg: TempReg ]. + unforwardRcvr ifTrue: [ objectRepresentation genEnsureOopInRegNotForwarded: rcvrReg scratchReg: TempReg ]. + + counterReg := self allocateRegNotConflictingWith: regMask. + self + genExecutionCountLogicInto: [ :cAddress :countTripBranch | + counterAddress := cAddress. + countTripped := countTripBranch ] + counterReg: counterReg. + + self assert: (unforwardArg or: [ unforwardRcvr ]). + self genCmpArgIsConstant: unforwardArg not rcvrIsConstant: unforwardRcvr not argReg: argReg rcvrReg: rcvrReg. + self ssPop: 2. + + "We could use (branchDescriptor isBranchTrue xor: orNot) to simplify this." + orNot + ifFalse: [branchDescriptor isBranchTrue + ifTrue: + [ fixup := (self ensureNonMergeFixupAt: postBranchPC - initialPC) asUnsignedInteger. + self JumpZero: (self ensureNonMergeFixupAt: targetBytecodePC - initialPC) asUnsignedInteger ] + ifFalse: "branchDescriptor is branchFalse" + [ fixup := (self ensureNonMergeFixupAt: targetBytecodePC - initialPC) asUnsignedInteger. + self JumpZero: (self ensureNonMergeFixupAt: postBranchPC - initialPC) asUnsignedInteger ]] + ifTrue: [branchDescriptor isBranchTrue + ifFalse: "branchDescriptor is branchFalse" + [ fixup := (self ensureNonMergeFixupAt: postBranchPC - initialPC) asUnsignedInteger. + self JumpZero: (self ensureNonMergeFixupAt: targetBytecodePC - initialPC) asUnsignedInteger ] + ifTrue: + [ fixup := (self ensureNonMergeFixupAt: targetBytecodePC - initialPC) asUnsignedInteger. + self JumpZero: (self ensureNonMergeFixupAt: postBranchPC - initialPC) asUnsignedInteger ]]. + + self genFallsThroughCountLogicCounterReg: counterReg counterAddress: counterAddress. + self Jump: fixup. + + countTripped jmpTarget: self Label. + + "inlined version of #== ignoring the branchDescriptor if the counter trips to have normal state for the optimizer" + self ssPop: -2. + self genCmpArgIsConstant: unforwardArg not rcvrIsConstant: unforwardRcvr not argReg: argReg rcvrReg: rcvrReg. + self ssPop: 2. + + "This code necessarily directly falls through the jumpIf: code which pops the top of the stack into TempReg. + We therefore directly assign the result to TempReg to save one move instruction" + jumpEqual := orNot ifFalse: [self JumpZero: 0] ifTrue: [self JumpNonZero: 0]. + self genMoveFalseR: TempReg. + jumpNotEqual := self Jump: 0. + jumpEqual jmpTarget: (self genMoveTrueR: TempReg). + jumpNotEqual jmpTarget: self Label. + self ssPushRegister: TempReg. + + (self fixupAt: nextPC - initialPC) notAFixup ifTrue: [ branchReachedOnlyForCounterTrip := true ]. + + ^ 0! Item was added: + ----- Method: SistaCogitClone>>genJumpIf:to: (in category 'bytecode generator support') ----- + genJumpIf: boolean to: targetBytecodePC + "The heart of performance counting in Sista. Conditional branches are 6 times less + frequent than sends and can provide basic block frequencies (send counters can't). + Each conditional has a 32-bit counter split into an upper 16 bits counting executions + and a lower half counting untaken executions of the branch. Executing the branch + decrements the upper half, tripping if the count goes negative. Not taking the branch + decrements the lower half. N.B. We *do not* eliminate dead branches (true ifTrue:/true ifFalse:) + so that scanning for send and branch data is simplified and that branch data is correct." + <inline: false> + | ok counterAddress countTripped retry nextPC nextDescriptor desc | + <var: #ok type: #'AbstractInstruction *'> + <var: #desc type: #'CogSimStackEntry *'> + <var: #retry type: #'AbstractInstruction *'> + <var: #countTripped type: #'AbstractInstruction *'> + <var: #nextDescriptor type: #'BytecodeDescriptor *'> + + "In optimized code we don't generate counters to improve performance" + (coInterpreter isOptimizedMethod: methodObj) ifTrue: [ ^ super genJumpIf: boolean to: targetBytecodePC ]. + + "If the branch is reached only for the counter trip trampoline + (typically, var1 == var2 ifTrue: falls through to the branch only for the trampoline) + we generate a specific path to drastically reduce the number of machine instructions" + branchReachedOnlyForCounterTrip ifTrue: + [ branchReachedOnlyForCounterTrip := false. + ^ self genCounterTripOnlyJumpIf: boolean to: targetBytecodePC ]. + + "We detect and: / or:, if found, we don't generate the counters to avoid pathological counter slow down" + boolean == objectMemory falseObject ifTrue: + [ nextPC := bytecodePC + (self generatorAt: byte0) numBytes. + nextDescriptor := self generatorAt: (objectMemory fetchByte: nextPC ofObject: methodObj) + bytecodeSetOffset. + nextDescriptor generator == #genPushConstantTrueBytecode ifTrue: [ ^ super genJumpIf: boolean to: targetBytecodePC ]. + nextDescriptor := self generatorAt: (objectMemory fetchByte: targetBytecodePC ofObject: methodObj) + bytecodeSetOffset. + nextDescriptor generator == #genPushConstantFalseBytecode ifTrue: [ ^ super genJumpIf: boolean to: targetBytecodePC ]. ]. + + extA := 0. "We ignore the noMustBeBoolean flag. It should not be present in methods with counters, and if it is we don't care." + + "We don't generate counters on branches on true/false, the basicblock usage can be inferred" + desc := self ssTop. + (desc type == SSConstant + and: [desc constant = objectMemory trueObject or: [desc constant = objectMemory falseObject]]) ifTrue: + [ ^ super genJumpIf: boolean to: targetBytecodePC ]. + + self ssFlushTo: simStackPtr - 1. + desc popToReg: TempReg. + self ssPop: 1. + + "We need SendNumArgsReg because of the mustBeBooleanTrampoline" + self ssAllocateRequiredReg: SendNumArgsReg. + + retry := self Label. + self + genExecutionCountLogicInto: [ :cAddress :countTripBranch | + counterAddress := cAddress. + countTripped := countTripBranch ] + counterReg: SendNumArgsReg. + counterIndex := counterIndex + 1. + + "Cunning trick by LPD. If true and false are contiguous subtract the smaller. + Correct result is either 0 or the distance between them. If result is not 0 or + their distance send mustBeBoolean." + self assert: (objectMemory objectAfter: objectMemory falseObject) = objectMemory trueObject. + self genSubConstant: boolean R: TempReg. + self JumpZero: (self ensureFixupAt: targetBytecodePC - initialPC). + + self genFallsThroughCountLogicCounterReg: SendNumArgsReg counterAddress: counterAddress. + + self CmpCq: (boolean = objectMemory falseObject + ifTrue: [objectMemory trueObject - objectMemory falseObject] + ifFalse: [objectMemory falseObject - objectMemory trueObject]) + R: TempReg. + ok := self JumpZero: 0. + self MoveCq: 0 R: SendNumArgsReg. "if counterReg is 0 this is a mustBeBoolean, not a counter trip." + + countTripped jmpTarget: (self genCallMustBeBooleanFor: boolean). + + "If we're in an image which hasn't got the Sista code loaded then the ceCounterTripped: + trampoline will return directly to machine code, returning the boolean. So the code should + jump back to the retry point. The trampoline makes sure that TempReg has been reloaded." + self annotateBytecode: self Label. "For some reason if I write self annotateBytecode: (self Jump: retry) the annotation is not at the correct place." + self Jump: retry. + + ok jmpTarget: self Label. + ^0! Item was added: + ----- Method: SistaCogitClone>>genMustBeBooleanTrampolineFor:called: (in category 'initialization') ----- + genMustBeBooleanTrampolineFor: boolean called: trampolineName + "This can be entered in one of two states, depending on SendNumArgsReg. See + e.g. genJumpIf:to:. If SendNumArgsReg is non-zero then this has been entered via + the initial test of the counter in the jump executed count (i.e. the counter has + tripped). In this case TempReg contains the boolean to be tested and should not + be offset, and ceCounterTripped should be invoked with the unoffset TempReg. + If SendNumArgsReg is zero then this has been entered for must-be-boolean + processing. TempReg has been offset by boolean and must be corrected and + ceSendMustBeBoolean: invoked with the corrected value." + <var: #trampolineName type: #'char *'> + | jumpMBB | + <var: #jumpMBB type: #'AbstractInstruction *'> + <inline: false> + self zeroOpcodeIndex. + self CmpCq: 0 R: SendNumArgsReg. + jumpMBB := self JumpZero: 0. + "Open-code self compileTrampolineFor: #ceCounterTripped: numArgs: 1 arg: TempReg ... + so we can restore ResultReceiverReg." + self genSmalltalkToCStackSwitch: true. + self + compileCallFor: #ceCounterTripped: + numArgs: 1 + arg: TempReg + arg: nil + arg: nil + arg: nil + resultReg: TempReg "(*)" + regsToSave: self emptyRegisterMask. + "(*) For the case where the ceCounterTripped: call returns (e.g. because there's no callback selector + installed), the call to the ceSendMustBeBooleanAddTrue/FalseTrampoline is followed by a jump + back to the start of the counter/condition test sequence. For this case copy the C result to + TempReg (the register that is tested), to reload it with the boolean to be tested." + backEnd genLoadStackPointers. + backEnd hasLinkRegister ifTrue: + [self PopR: LinkReg]. + "To keep ResultReceiverReg live if optStatus thought it was, simply reload it + from the frame pointer. This avoids having to reload it in the common case + (counter does not trip) if it was live. Note we can't use putSelfInReceiverResultReg + when generating trampolines because simSelf has not yet been initialized." + self MoveMw: FoxMFReceiver r: FPReg R: ReceiverResultReg. + self RetN: 0. + "If the objectRepresentation does want true & false to be mobile then we need to record these addresses." + self assert: (objectRepresentation shouldAnnotateObjectReference: boolean) not. + jumpMBB jmpTarget: (self AddCq: boolean R: TempReg). + ^self genTrampolineFor: #ceSendMustBeBoolean: + called: trampolineName + numArgs: 1 + arg: TempReg + arg: nil + arg: nil + arg: nil + regsToSave: self emptyRegisterMask + pushLinkReg: true + resultReg: NoReg + appendOpcodes: true! Item was added: + ----- Method: SistaCogitClone>>genNullaryInlinePrimitive: (in category 'inline primitive generators') ----- + genNullaryInlinePrimitive: prim + "Nullary inline primitives." + "SistaV1: 248 11111000 iiiiiiii mjjjjjjj Call Primitive #iiiiiiii + (jjjjjjj * 256) m=1 means inlined primitive, no hard return after execution. + See EncoderForSistaV1's class comment and StackInterpreter>>#nullaryInlinePrimitive:" + + <option: #SistaVM> + ^EncounteredUnknownBytecode! Item was added: + ----- Method: SistaCogitClone>>genSpecialSelectorComparison (in category 'bytecode generators') ----- + genSpecialSelectorComparison + "Override to count inlined branches if followed by a conditional branch. + We borrow the following conditional branch's counter and when about to + inline the comparison we decrement the counter (without writing it back) + and if it trips simply abort the inlining, falling back to the normal send which + will then continue to the conditional branch which will trip and enter the abort." + | nextPC postBranchPC targetBytecodePC primDescriptor branchDescriptor + rcvrIsInt argIsInt argInt jumpNotSmallInts inlineCAB + counterAddress countTripped counterReg index | + <var: #countTripped type: #'AbstractInstruction *'> + <var: #primDescriptor type: #'BytecodeDescriptor *'> + <var: #jumpNotSmallInts type: #'AbstractInstruction *'> + <var: #branchDescriptor type: #'BytecodeDescriptor *'> + + (coInterpreter isOptimizedMethod: methodObj) ifTrue: [ ^ self genSpecialSelectorComparisonWithoutCounters ]. + + self ssFlushTo: simStackPtr - 2. + primDescriptor := self generatorAt: byte0. + argIsInt := self ssTop type = SSConstant + and: [objectMemory isIntegerObject: (argInt := self ssTop constant)]. + rcvrIsInt := (self ssValue: 1) type = SSConstant + and: [objectMemory isIntegerObject: (self ssValue: 1) constant]. + + "short-cut the jump if operands are SmallInteger constants." + (argIsInt and: [rcvrIsInt]) ifTrue: + [^ self genStaticallyResolvedSpecialSelectorComparison]. + + self extractMaybeBranchDescriptorInto: [ :descr :next :postBranch :target | + branchDescriptor := descr. nextPC := next. postBranchPC := postBranch. targetBytecodePC := target ]. + + "Only interested in inlining if followed by a conditional branch." + inlineCAB := branchDescriptor isBranchTrue or: [branchDescriptor isBranchFalse]. + "Further, only interested in inlining = and ~= if there's a SmallInteger constant involved. + The relational operators successfully statically predict SmallIntegers; the equality operators do not." + (inlineCAB and: [primDescriptor opcode = JumpZero or: [primDescriptor opcode = JumpNonZero]]) ifTrue: + [inlineCAB := argIsInt or: [rcvrIsInt]]. + inlineCAB ifFalse: + [^self genSpecialSelectorSend]. + + argIsInt + ifTrue: + [(self ssValue: 1) popToReg: ReceiverResultReg. + self ssPop: 2. + self MoveR: ReceiverResultReg R: TempReg] + ifFalse: + [self marshallSendArguments: 1. + self MoveR: Arg0Reg R: TempReg]. + jumpNotSmallInts := (argIsInt or: [rcvrIsInt]) + ifTrue: [objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg] + ifFalse: [objectRepresentation genJumpNotSmallIntegersIn: ReceiverResultReg andScratch: TempReg scratch: ClassReg]. + + counterReg := self allocateRegNotConflictingWith: (self registerMaskFor: ReceiverResultReg and: Arg0Reg). + self + genExecutionCountLogicInto: [ :cAddress :countTripBranch | + counterAddress := cAddress. + countTripped := countTripBranch ] + counterReg: counterReg. + + argIsInt + ifTrue: [self CmpCq: argInt R: ReceiverResultReg] + ifFalse: [self CmpR: Arg0Reg R: ReceiverResultReg]. + "Cmp is weird/backwards so invert the comparison. Further since there is a following conditional + jump bytecode define non-merge fixups and leave the cond bytecode to set the mergeness." + self genConditionalBranch: (branchDescriptor isBranchTrue + ifTrue: [primDescriptor opcode] + ifFalse: [self inverseBranchFor: primDescriptor opcode]) + operand: (self ensureNonMergeFixupAt: targetBytecodePC - initialPC) asUnsignedInteger. + + self genFallsThroughCountLogicCounterReg: counterReg counterAddress: counterAddress. + + self Jump: (self ensureNonMergeFixupAt: postBranchPC - initialPC). + countTripped jmpTarget: (jumpNotSmallInts jmpTarget: self Label). + + argIsInt ifTrue: + [self MoveCq: argInt R: Arg0Reg]. + index := byte0 - self firstSpecialSelectorBytecodeOffset. + ^self genMarshalledSend: index negated - 1 numArgs: 1 sendTable: ordinarySendTrampolines! Item was added: + ----- Method: SistaCogitClone>>genSpecialSelectorComparisonWithoutCounters (in category 'bytecode generators') ----- + genSpecialSelectorComparisonWithoutCounters + "This method is there because if I put directly the super send in genSpecialSelectorComparison Slang does not correctly translte the code to C, it does not correctly type one of the branchDescriptor to BytecodeDescriptor" + ^ super genSpecialSelectorComparison! Item was added: + ----- Method: SistaCogitClone>>genTrinaryInlinePrimitive: (in category 'inline primitive generators') ----- + genTrinaryInlinePrimitive: prim + "Unary inline primitives." + "SistaV1: 248 11111000 iiiiiiii mjjjjjjj Call Primitive #iiiiiiii + (jjjjjjj * 256) m=1 means inlined primitive, no hard return after execution. + See EncoderForSistaV1's class comment and StackInterpreter>>#trinaryInlinePrimitive:" + | ra1 ra2 rr adjust needsStoreCheck | + "The store check requires rr to be ReceiverResultReg" + needsStoreCheck := (objectRepresentation isUnannotatableConstant: self ssTop) not. + self + allocateRegForStackTopThreeEntriesInto: [:rTop :rNext :rThird | ra2 := rTop. ra1 := rNext. rr := rThird ] + thirdIsReceiver: (prim = 0 and: [ needsStoreCheck ]). + self assert: (rr ~= ra1 and: [rr ~= ra2 and: [ra1 ~= ra2]]). + self ssTop popToReg: ra2. + self ssPop: 1. + self ssTop popToReg: ra1. + self ssPop: 1. + self ssTop popToReg: rr. + self ssPop: 1. + objectRepresentation genConvertSmallIntegerToIntegerInReg: ra1. + "Now: ra is the variable object, rr is long, TempReg holds the value to store." + self flag: #TODO. "This is not really working as the immutability and store check needs to be present. " + prim caseOf: { + "0 - 1 pointerAt:put: and byteAt:Put:" + [0] -> [ adjust := (objectMemory baseHeaderSize >> objectMemory shiftForWord) - 1. "shift by baseHeaderSize and then move from 1 relative to zero relative" + adjust ~= 0 ifTrue: [ self AddCq: adjust R: ra1. ]. + self MoveR: ra2 Xwr: ra1 R: rr. + "I added needsStoreCheck so if you initialize an array with a Smi such as 0 or a boolean you don't need the store check" + needsStoreCheck ifTrue: + [ self assert: needsFrame. + objectRepresentation genStoreCheckReceiverReg: rr valueReg: ra2 scratchReg: TempReg inFrame: true] ]. + [1] -> [ objectRepresentation genConvertSmallIntegerToIntegerInReg: ra2. + adjust := objectMemory baseHeaderSize - 1. "shift by baseHeaderSize and then move from 1 relative to zero relative" + self AddCq: adjust R: ra1. + self MoveR: ra2 Xbr: ra1 R: rr. + objectRepresentation genConvertIntegerToSmallIntegerInReg: ra2. ] + } + otherwise: [^EncounteredUnknownBytecode]. + self ssPushRegister: ra2. + ^0! Item was added: + ----- Method: SistaCogitClone>>genUnaryInlinePrimitive: (in category 'inline primitive generators') ----- + genUnaryInlinePrimitive: prim + "Unary inline primitives." + "SistaV1: 248 11111000 iiiiiiii mjjjjjjj Call Primitive #iiiiiiii + (jjjjjjj * 256) m=1 means inlined primitive, no hard return after execution. + See EncoderForSistaV1's class comment and StackInterpreter>>#unaryInlinePrimitive:" + | rcvrReg resultReg | + rcvrReg := self allocateRegForStackEntryAt: 0. + resultReg := self allocateRegNotConflictingWith: (self registerMaskFor: rcvrReg). + prim + caseOf: { + "00 unchecked class" + [1] -> "01 unchecked pointer numSlots" + [self ssTop popToReg: rcvrReg. + self ssPop: 1. + objectRepresentation + genGetNumSlotsOf: rcvrReg into: resultReg; + genConvertIntegerToSmallIntegerInReg: resultReg]. + "02 unchecked pointer basicSize" + [3] -> "03 unchecked byte numBytes" + [self ssTop popToReg: rcvrReg. + self ssPop: 1. + objectRepresentation + genGetNumBytesOf: rcvrReg into: resultReg; + genConvertIntegerToSmallIntegerInReg: resultReg]. + "04 unchecked short16Type format numShorts" + "05 unchecked word32Type format numWords" + "06 unchecked doubleWord64Type format numDoubleWords" + [11] -> "11 unchecked fixed pointer basicNew" + [self ssTop type ~= SSConstant ifTrue: + [^EncounteredUnknownBytecode]. + (objectRepresentation + genGetInstanceOf: self ssTop constant + into: resultReg + initializingIf: self extBSpecifiesInitializeInstance) ~= 0 ifTrue: + [^ShouldNotJIT]. "e.g. bad class" + self ssPop: 1] + } + otherwise: + [^EncounteredUnknownBytecode]. + extB := 0. + self ssPushRegister: resultReg. + ^0! Item was added: + ----- Method: SistaCogitClone>>genUnconditionalTrapBytecode (in category 'bytecode generators') ----- + genUnconditionalTrapBytecode + "SistaV1: * 217 Trap" + self ssFlushTo: simStackPtr. + self CallRT: ceTrapTrampoline. + self annotateBytecode: self Label. + ^0! Item was added: + ----- Method: SistaCogitClone>>genUnoptimizedSpecialSelectorComparison (in category 'bytecode generators') ----- + genUnoptimizedSpecialSelectorComparison + "This method is there because if I put directly the super send in genSpecialSelectorComparison Slang does not correctly translte the code to C, it does not correctly type one of the branchDescriptor to BytecodeDescriptor" + ^ super genSpecialSelectorComparison! Item was added: + ----- Method: SistaCogitClone>>generateSistaRuntime (in category 'initialization') ----- + generateSistaRuntime + "Trap sends Sista trap message to context with top of stack, so we don't need any arguments..." + ceTrapTrampoline := self genTrampolineFor: #ceSistaTrap called: 'ceSistaTrapTrampoline'! Item was added: + ----- Method: SistaCogitClone>>getJumpTargetPCAt: (in category 'method introspection') ----- + getJumpTargetPCAt: pc + <api> + ^backEnd jumpTargetPCAt: pc! Item was added: + ----- Method: SistaCogitClone>>initialize (in category 'initialization') ----- + initialize + super initialize. + branchReachedOnlyForCounterTrip := false. + cogMethodSurrogateClass := (objectMemory ifNil: [self class objectMemoryClass]) wordSize = 4 + ifTrue: [CogSistaMethodSurrogate32] + ifFalse: [CogSistaMethodSurrogate64]! Item was added: + ----- Method: SistaCogitClone>>initializeCodeZoneFrom:upTo: (in category 'initialization') ----- + initializeCodeZoneFrom: startAddress upTo: endAddress + initialCounterValue := MaxCounterValue. + super initializeCodeZoneFrom: startAddress upTo: endAddress! Item was added: + ----- Method: SistaCogitClone>>maybeAllocAndInitCounters (in category 'compile abstract instructions') ----- + maybeAllocAndInitCounters + <inline: true> + self assert: counters = 0. + counterIndex := 0. + numCounters = 0 ifTrue: + [^true]. + counters := objectRepresentation allocateCounters: numCounters. + ^counters ~= 0! Item was added: + ----- Method: SistaCogitClone>>maybeCountCounter (in category 'compile abstract instructions') ----- + maybeCountCounter + <inline: true> + numCounters := numCounters + 1! Item was added: + ----- Method: SistaCogitClone>>maybeCounterIndex (in category 'compile abstract instructions') ----- + maybeCounterIndex + <inline: true> + ^counterIndex! Item was added: + ----- Method: SistaCogitClone>>maybeFreeCounters (in category 'compile abstract instructions') ----- + maybeFreeCounters + <inline: true> + counters ~= 0 ifTrue: + [objectRepresentation freeCounters: counters]! Item was added: + ----- Method: SistaCogitClone>>maybeFreeCountersOf: (in category 'compaction') ----- + maybeFreeCountersOf: aCogMethod + "Free any counters in the method." + <inline: true> + objectRepresentation freeCounters: aCogMethod counters! Item was added: + ----- Method: SistaCogitClone>>maybeInitNumCounters (in category 'compile abstract instructions') ----- + maybeInitNumCounters + <inline: true> + numCounters := 0! Item was added: + ----- Method: SistaCogitClone>>maybeMarkCountersIn: (in category 'garbage collection') ----- + maybeMarkCountersIn: cogMethod + "In SIsta Spur counters are held on the heap in pinned objects which must be marked + to avoid them being garbage collected. This is the hook through which that happens." + <var: #cogMethod type: #'CogMethod *'> + <inline: true> + objectRepresentation maybeMarkCounters: cogMethod counters! Item was added: + ----- Method: SistaCogitClone>>maybeSetCounterIndex: (in category 'compile abstract instructions') ----- + maybeSetCounterIndex: value + <inline: true> + counterIndex := value! Item was added: + ----- Method: SistaCogitClone>>methodsCompiledToMachineCodeInto: (in category 'simulation only') ----- + methodsCompiledToMachineCodeInto: arrayObject + <doNotGenerate> + ^methodZone methodsCompiledToMachineCodeInto: arrayObject! Item was added: + ----- Method: SistaCogitClone>>numMethods (in category 'simulation only') ----- + numMethods + <doNotGenerate> + ^methodZone numMethods! Item was added: + ----- Method: SistaCogitClone>>picDataFor:Annotation:Mcpc:Bcpc:Method: (in category 'method introspection') ----- + picDataFor: descriptor Annotation: isBackwardBranchAndAnnotation Mcpc: mcpc Bcpc: bcpc Method: cogMethodArg + <var: #descriptor type: #'BytecodeDescriptor *'> + <var: #mcpc type: #'char *'> + <var: #cogMethodArg type: #'void *'> + | annotation entryPoint tuple counter | + "N.B. Counters are always 32-bits, having two 16-bit halves for the reached and taken counts." + <var: #counter type: #'unsigned int'> + + descriptor ifNil: + [^0]. + descriptor isBranch ifTrue: + ["it's a branch; conditional?" + (descriptor isBranchTrue or: [descriptor isBranchFalse]) ifTrue: + [counter := (self + cCoerce: ((self + cCoerceSimple: cogMethodArg + to: #'CogMethod *') counters) + to: #'usqInt *') + at: counterIndex. + tuple := self picDataForCounter: counter at: bcpc + 1. + tuple = 0 ifTrue: [^PrimErrNoMemory]. + objectMemory storePointer: introspectionDataIndex ofObject: introspectionData withValue: tuple. + introspectionDataIndex := introspectionDataIndex + 1. + counterIndex := counterIndex + 1]. + ^0]. + annotation := isBackwardBranchAndAnnotation >> 1. + ((self isPureSendAnnotation: annotation) + and: [entryPoint := backEnd callTargetFromReturnAddress: mcpc asUnsignedInteger. + entryPoint > methodZoneBase]) ifFalse: "send is not linked, or is not a send" + [^0]. + self targetMethodAndSendTableFor: entryPoint "It's a linked send; find which kind." + annotation: annotation + into: [:targetMethod :sendTable| | methodClassIfSuper association | + methodClassIfSuper := nil. + sendTable = superSendTrampolines ifTrue: + [methodClassIfSuper := coInterpreter methodClassOf: (self cCoerceSimple: cogMethodArg to: #'CogMethod *') methodObject]. + sendTable = directedSuperSendTrampolines ifTrue: + [association := backEnd literalBeforeInlineCacheTagAt: mcpc asUnsignedInteger. + methodClassIfSuper := objectRepresentation valueOfAssociation: association]. + tuple := self picDataForSendTo: targetMethod + methodClassIfSuper: methodClassIfSuper + at: mcpc + bcpc: bcpc + 1]. + tuple = 0 ifTrue: [^PrimErrNoMemory]. + objectMemory storePointer: introspectionDataIndex ofObject: introspectionData withValue: tuple. + introspectionDataIndex := introspectionDataIndex + 1. + ^0! Item was added: + ----- Method: SistaCogitClone>>picDataFor:into: (in category 'method introspection') ----- + picDataFor: cogMethod into: arrayObj + "Collect the branch and send data for cogMethod, storing it into arrayObj." + <api> + <var: #cogMethod type: #'CogMethod *'> + | errCode | + cogMethod stackCheckOffset = 0 ifTrue: + [^0]. + introspectionDataIndex := counterIndex := 0. + introspectionData := arrayObj. + errCode := self + mapFor: (self cCoerceSimple: cogMethod to: #'CogBlockMethod *') + bcpc: (coInterpreter startPCOfMethod: cogMethod methodObject) + performUntil: #picDataFor:Annotation:Mcpc:Bcpc:Method: + arg: cogMethod asVoidPointer. + errCode ~= 0 ifTrue: + [self assert: errCode = PrimErrNoMemory. + ^-1]. + cogMethod blockEntryOffset ~= 0 ifTrue: + [errCode := self blockDispatchTargetsFor: cogMethod + perform: #picDataForBlockEntry:Method: + arg: cogMethod asInteger. + errCode ~= 0 ifTrue: + [self assert: errCode = PrimErrNoMemory. + ^-1]]. + ^introspectionDataIndex! Item was added: + ----- Method: SistaCogitClone>>picDataForBlockEntry:Method: (in category 'method introspection') ----- + picDataForBlockEntry: blockEntryMcpc Method: cogMethod + "Collect the branch and send data for the block method starting at blockEntryMcpc, storing it into picData." + <returnTypeC: #usqInt> + | cogBlockMethod | + <var: #cogBlockMethod type: #'CogBlockMethod *'> + cogBlockMethod := self cCoerceSimple: blockEntryMcpc - (self sizeof: CogBlockMethod) + to: #'CogBlockMethod *'. + cogBlockMethod stackCheckOffset = 0 ifTrue: + [^0]. + ^self + mapFor: cogBlockMethod + bcpc: cogBlockMethod startpc + performUntil: #picDataFor:Annotation:Mcpc:Bcpc:Method: + arg: cogMethod asVoidPointer! Item was added: + ----- Method: SistaCogitClone>>picDataForCounter:at: (in category 'method introspection') ----- + picDataForCounter: counter at: bcpc + | executedCount tuple untakenCount | + "N.B. Counters are always 32-bits, having two 16-bit halves for the reached and taken counts." + <var: #counter type: #'unsigned int'> + tuple := objectMemory + eeInstantiateClassIndex: ClassArrayCompactIndex + format: objectMemory arrayFormat + numSlots: 3. + tuple = 0 ifTrue: + [^0]. + self assert: CounterBytes = 4. + executedCount := initialCounterValue - (counter >> 16). + untakenCount := initialCounterValue - (counter bitAnd: 16rFFFF). + objectMemory + storePointerUnchecked: 0 ofObject: tuple withValue: (objectMemory integerObjectOf: bcpc); + storePointerUnchecked: 1 ofObject: tuple withValue: (objectMemory integerObjectOf: executedCount); + storePointerUnchecked: 2 ofObject: tuple withValue: (objectMemory integerObjectOf: untakenCount). + ^tuple! Item was added: + ----- Method: SistaCogitClone>>picDataForSendTo:methodClassIfSuper:at:bcpc: (in category 'method introspection') ----- + picDataForSendTo: cogMethod methodClassIfSuper: methodClassOrNil at: sendMcpc bcpc: sendBcpc + "Answer a tuple with the send data for a linked send to cogMethod. + If the target is a CogMethod (monomorphic send) answer + { bytecode pc, inline cache class, target method } + If the target is an open PIC (megamorphic send) answer + { bytecode pc, nil, send selector } + If the target is a closed PIC (polymorphic send) answer + { bytecode pc, first class, target method, second class, second target method, ... }" + <var: #cogMethod type: #'CogMethod *'> + <var: #sendMcpc type: #'char *'> + | tuple class | + tuple := objectMemory + eeInstantiateClassIndex: ClassArrayCompactIndex + format: objectMemory arrayFormat + numSlots: (cogMethod cmType = CMClosedPIC + ifTrue: [2 * cogMethod cPICNumCases + 1] + ifFalse: [3]). + tuple = 0 ifTrue: + [^0]. + objectMemory storePointerUnchecked: 0 ofObject: tuple withValue: (objectMemory integerObjectOf: sendBcpc). + cogMethod cmType = CMMethod ifTrue: + [class := methodClassOrNil ifNil: + [objectRepresentation classForInlineCacheTag: (backEnd inlineCacheTagAt: sendMcpc asUnsignedInteger)]. + objectMemory + storePointer: 1 ofObject: tuple withValue: class; + storePointer: 2 ofObject: tuple withValue: cogMethod methodObject. + ^tuple]. + cogMethod cmType = CMClosedPIC ifTrue: + [self populate: tuple withPICInfoFor: cogMethod firstCacheTag: (backEnd inlineCacheTagAt: sendMcpc asUnsignedInteger). + ^tuple]. + cogMethod cmType = CMOpenPIC ifTrue: + [objectMemory + storePointerUnchecked: 1 ofObject: tuple withValue: objectMemory nilObject; + storePointer: 2 ofObject: tuple withValue: cogMethod selector. + ^tuple]. + self error: 'invalid method type'. + ^0 "to get Slang to type this method as answering sqInt"! Item was added: + ----- Method: SistaCogitClone>>populate:withPICInfoFor:firstCacheTag: (in category 'method introspection') ----- + populate: tuple withPICInfoFor: cPIC firstCacheTag: firstCacheTag + "Populate tuple (which must be large enough) with the ClosedPIC's target method class pairs. + The first entry in tuple contains the bytecode pc for the send, so skip the tuple's first field." + <var: #cPIC type: #'CogMethod *'> + | pc cacheTag classOop entryPoint targetMethod value | + <var: #targetMethod type: #'CogMethod *'> + + 1 to: cPIC cPICNumCases do: + [:i| + pc := self addressOfEndOfCase: i inCPIC: cPIC. + cacheTag := i = 1 + ifTrue: [firstCacheTag] + ifFalse: [backEnd literalBeforeFollowingAddress: pc - backEnd jumpLongConditionalByteSize]. + classOop := objectRepresentation classForInlineCacheTag: cacheTag. + objectMemory storePointer: i * 2 - 1 ofObject: tuple withValue: classOop. + entryPoint := i = 1 + ifTrue: [backEnd jumpLongTargetBeforeFollowingAddress: pc] + ifFalse: [backEnd jumpLongConditionalTargetBeforeFollowingAddress: pc]. + "Find target from jump. A jump to the MNU entry-point should collect #doesNotUnderstand:" + (cPIC containsAddress: entryPoint) + ifTrue: + [value := objectMemory splObj: SelectorDoesNotUnderstand] + ifFalse: + [targetMethod := self cCoerceSimple: entryPoint - cmNoCheckEntryOffset to: #'CogMethod *'. + self assert: targetMethod cmType = CMMethod. + value := targetMethod methodObject]. + objectMemory storePointer: i * 2 ofObject: tuple withValue: value]! Item was added: + ----- Method: SistaCogitClone>>printPICDataForMethods (in category 'tests') ----- + printPICDataForMethods + <doNotGenerate> + methodZone methodsDo: + [:cogMethod| + cogMethod cmType = CMMethod ifTrue: + [(coInterpreter picDataFor: cogMethod) ifNotNil: + [:thePicData| + coInterpreter printOop: thePicData]]]! Item was added: + ----- Method: SistaCogitClone>>resetCountersIn: (in category 'sista callbacks') ----- + resetCountersIn: cogMethod + <doNotGenerate> + objectRepresentation resetCountersIn: cogMethod!

1 0

VM Maker: VMMaker.oscog-eem.2036.mcz
by commits＠source.squeak.org 12 Dec '16

12 Dec '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.2036.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.2036 Author: eem Time: 12 December 2016, 11:31:09.926368 am UUID: f3615bfa-2eb4-49c1-9b34-0a8d37c5886b Ancestors: VMMaker.oscog-cb.2035 SistaCogit: Fix counter generation for 64-bits. Remopve a #== that should be an #=. Sista & RegisterAllocatingCogit: Add SistaCogitClone & SistaRegisterAllocatingCogit to allow putting Sista under the RegisterAllocatingCogit. Have SistaRegisterAllocatingCogit maintain code in SistaCogitClone. General: Nuke an obsolete maintennance script. =============== Diff against VMMaker.oscog-cb.2035 =============== Item was added: + ----- Method: ClassDescription>>>>> (in category '*VMMaker-accessing') ----- + >>> aSelector + "Convenience for creating MethodReferences" + ^MethodReference class: self selector: aSelector! Item was changed: ----- Method: SistaCogit>>disassembleMethod:on: (in category 'disassembly') ----- disassembleMethod: surrogateOrAddress on: aStream <doNotGenerate> | cogMethod | cogMethod := super disassembleMethod: surrogateOrAddress on: aStream. (cogMethod cmType = CMMethod and: [cogMethod counters ~= 0]) ifTrue: [aStream nextPutAll: 'counters:'; cr. numCounters := objectRepresentation numCountersFor: counters. 0 to: numCounters - 1 do: [:i| | addr | addr := i * CounterBytes + counters. addr printOn: aStream base: 16. aStream nextPut: $:; space. + (objectMemory long32At: addr) printOn: aStream base: 16. - (objectMemory longAt: addr) printOn: aStream base: 16. aStream cr]. aStream flush]! Item was changed: ----- Method: SistaCogit>>genExecutionCountLogicInto:counterReg: (in category 'bytecode generator support') ----- genExecutionCountLogicInto: binaryBlock counterReg: counterReg <var: #countTripped type: #'AbstractInstruction *'> <inline: true> | counterAddress countTripped | + counterAddress := counters + (CounterBytes * counterIndex). - counterAddress := counters + ((self sizeof: #sqInt) * counterIndex). - self assert: objectMemory wordSize = CounterBytes. self MoveA32: counterAddress R: counterReg. self SubCq: 16r10000 R: counterReg. "Count executed" "If counter trips simply abort the comparison continuing to the following branch *without* writing back. A double decrement will not trip the second time." countTripped := self JumpCarry: 0. self MoveR: counterReg A32: counterAddress. "write back" binaryBlock value: counterAddress value: countTripped! Item was changed: ----- Method: SistaCogit>>genJumpIf:to: (in category 'bytecode generator support') ----- genJumpIf: boolean to: targetBytecodePC "The heart of performance counting in Sista. Conditional branches are 6 times less frequent than sends and can provide basic block frequencies (send counters can't). Each conditional has a 32-bit counter split into an upper 16 bits counting executions and a lower half counting untaken executions of the branch. Executing the branch decrements the upper half, tripping if the count goes negative. Not taking the branch decrements the lower half. N.B. We *do not* eliminate dead branches (true ifTrue:/true ifFalse:) so that scanning for send and branch data is simplified and that branch data is correct." <inline: false> | ok counterAddress countTripped retry nextPC nextDescriptor desc | <var: #ok type: #'AbstractInstruction *'> <var: #desc type: #'CogSimStackEntry *'> <var: #retry type: #'AbstractInstruction *'> <var: #countTripped type: #'AbstractInstruction *'> <var: #nextDescriptor type: #'BytecodeDescriptor *'> "In optimized code we don't generate counters to improve performance" (coInterpreter isOptimizedMethod: methodObj) ifTrue: [ ^ super genJumpIf: boolean to: targetBytecodePC ]. "If the branch is reached only for the counter trip trampoline (typically, var1 == var2 ifTrue: falls through to the branch only for the trampoline) we generate a specific path to drastically reduce the number of machine instructions" branchReachedOnlyForCounterTrip ifTrue: [ branchReachedOnlyForCounterTrip := false. ^ self genCounterTripOnlyJumpIf: boolean to: targetBytecodePC ]. "We detect and: / or:, if found, we don't generate the counters to avoid pathological counter slow down" boolean == objectMemory falseObject ifTrue: [ nextPC := bytecodePC + (self generatorAt: byte0) numBytes. nextDescriptor := self generatorAt: (objectMemory fetchByte: nextPC ofObject: methodObj) + bytecodeSetOffset. nextDescriptor generator == #genPushConstantTrueBytecode ifTrue: [ ^ super genJumpIf: boolean to: targetBytecodePC ]. nextDescriptor := self generatorAt: (objectMemory fetchByte: targetBytecodePC ofObject: methodObj) + bytecodeSetOffset. nextDescriptor generator == #genPushConstantFalseBytecode ifTrue: [ ^ super genJumpIf: boolean to: targetBytecodePC ]. ]. extA := 0. "We ignore the noMustBeBoolean flag. It should not be present in methods with counters, and if it is we don't care." "We don't generate counters on branches on true/false, the basicblock usage can be inferred" desc := self ssTop. (desc type == SSConstant and: [desc constant = objectMemory trueObject or: [desc constant = objectMemory falseObject]]) ifTrue: [ ^ super genJumpIf: boolean to: targetBytecodePC ]. self ssFlushTo: simStackPtr - 1. desc popToReg: TempReg. self ssPop: 1. "We need SendNumArgsReg because of the mustBeBooleanTrampoline" self ssAllocateRequiredReg: SendNumArgsReg. retry := self Label. self genExecutionCountLogicInto: [ :cAddress :countTripBranch | counterAddress := cAddress. countTripped := countTripBranch ] counterReg: SendNumArgsReg. counterIndex := counterIndex + 1. "Cunning trick by LPD. If true and false are contiguous subtract the smaller. Correct result is either 0 or the distance between them. If result is not 0 or their distance send mustBeBoolean." self assert: (objectMemory objectAfter: objectMemory falseObject) = objectMemory trueObject. self genSubConstant: boolean R: TempReg. self JumpZero: (self ensureFixupAt: targetBytecodePC - initialPC). self genFallsThroughCountLogicCounterReg: SendNumArgsReg counterAddress: counterAddress. + self CmpCq: (boolean = objectMemory falseObject - self CmpCq: (boolean == objectMemory falseObject ifTrue: [objectMemory trueObject - objectMemory falseObject] ifFalse: [objectMemory falseObject - objectMemory trueObject]) R: TempReg. ok := self JumpZero: 0. self MoveCq: 0 R: SendNumArgsReg. "if counterReg is 0 this is a mustBeBoolean, not a counter trip." countTripped jmpTarget: (self genCallMustBeBooleanFor: boolean). "If we're in an image which hasn't got the Sista code loaded then the ceCounterTripped: trampoline will return directly to machine code, returning the boolean. So the code should jump back to the retry point. The trampoline makes sure that TempReg has been reloaded." self annotateBytecode: self Label. "For some reason if I write self annotateBytecode: (self Jump: retry) the annotation is not at the correct place." self Jump: retry. ok jmpTarget: self Label. ^0! Item was added: + SistaRegisterAllocatingCogit subclass: #SistaCogitClone + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'VMMaker-JIT'! Item was added: + RegisterAllocatingCogit subclass: #SistaRegisterAllocatingCogit + instanceVariableNames: 'numCounters counters counterIndex initialCounterValue ceTrapTrampoline branchReachedOnlyForCounterTrip' + classVariableNames: 'CounterBytes MaxCounterValue' + poolDictionaries: 'VMSqueakClassIndices' + category: 'VMMaker-JIT'! + + !SistaRegisterAllocatingCogit commentStamp: 'eem 12/12/2016 09:18' prior: 0! + SistaRegisterAllocatingCogit is a port of SistaCogit under RegisterAllocatingCogit. Its subclass SistaCogitClone holds those methods that are identical to SistaCogit's. This class holds the methods that are different. SistaRegisterAllocatingCogit's initialize method keeps things up-to-date and arranges that no method implemented in SistaRegisterAllocatingCogit is implemented in SistaCogitClone so that super sends in SistaCogitClone activate code in RegisterAllocatingCogit as intended. + + Instance Variables + branchReachedOnlyForCounterTrip: <Object> + ceTrapTrampoline: <Object> + counterIndex: <Object> + counters: <Object> + initialCounterValue: <Object> + numCounters: <Object> + + branchReachedOnlyForCounterTrip + - xxxxx + + ceTrapTrampoline + - xxxxx + + counterIndex + - xxxxx + + counters + - xxxxx + + initialCounterValue + - xxxxx + + numCounters + - xxxxx + ! Item was added: + ----- Method: SistaRegisterAllocatingCogit class>>dateAndTimeFrom: (in category 'clone maintennance') ----- + dateAndTimeFrom: timeStampString + ^(timeStampString copyFrom: (timeStampString findFirst: [:c| c isDigit]) to: timeStampString size) asDateAndTime! Item was added: + ----- Method: SistaRegisterAllocatingCogit class>>implementation:isDifferentThan: (in category 'clone maintennance') ----- + implementation: aMethodReference isDifferentThan: bMethodReference + ^aMethodReference isValid + and: [bMethodReference isValid + ifTrue: [aMethodReference sourceString ~= bMethodReference sourceString] + ifFalse: [true]]! Item was added: + ----- Method: SistaRegisterAllocatingCogit class>>initializeWithOptions: (in category 'class initialization') ----- + initializeWithOptions: optionsDictionary + + self syncCodeWithSistaCogit ifTrue: "The subclass's #initializeWithOptions: method changed; resend." + [^self initializeWithOptions: optionsDictionary]. + + "Things are up-to-date; continue" + ^super initializeWithOptions: optionsDictionary! Item was added: + ----- Method: SistaRegisterAllocatingCogit class>>syncCodeIn:with:leavingUnchanged: (in category 'class initialization') ----- + syncCodeIn: sourceClass with: destClass leavingUnchanged: selectorOrNil + "Make sure that the SistaRegisterAllocatingCogit/SistaCogitClone combination is up-to-date w.r.t. SistaCogit. + - SistaCogitClone should have all methods in SistaCogit except those implemented in SistaRegisterAllocatingCogit. + This means that super sends in SistaCogitClone will be understood in SistaRegisterAllocatingCogit, not + SistaRegisterAllocatingCogit. + - newer methods in SistaCogitClone that are implemented in SistaRegisterAllocatingCogit should be moved up to + SistaRegisterAllocatingCogit becaude it means that we probably changed them in SistaCogitClone by mistake + and forgot to copy them up. + - the same goes for the class side, except for the intializeWithOptions: method which /should/ exist in both + SistaRegisterAllocatingCogit and SistaCogitClone, because it runs this initialization." + + | methodTimeStamp | + methodTimeStamp := selectorOrNil ifNotNil: + [(destClass superclass >>> selectorOrNil) isValid ifTrue: + [(destClass >>> selectorOrNil) isValid + ifTrue: [(destClass >>> selectorOrNil) timeStamp] + ifFalse: ['ancient 01/01/1901 00:00']]]. + + destClass selectorsDo: + [:s| + (s ~~ selectorOrNil + and: [(destClass superclass >>> s) isValid + and: [self implementation: destClass >>> s isNewerThan: destClass superclass >>> s]]) ifTrue: + [destClass superclass recompile: s from: destClass. + (destClass superclass whichCategoryIncludesSelector: s) ~= (destClass whichCategoryIncludesSelector: s) ifTrue: + [destClass superclass organization classify: s under: (destClass whichCategoryIncludesSelector: s)]]]. + + sourceClass selectorsDo: + [:s| + (self implementation: sourceClass >>> s isDifferentThan: destClass >>> s) ifTrue: + [destClass recompile: s from: sourceClass. + (destClass whichCategoryIncludesSelector: s) ~= (sourceClass whichCategoryIncludesSelector: s) ifTrue: + [destClass organization classify: s under: (sourceClass whichCategoryIncludesSelector: s)]]]. + + + destClass superclass selectorsDo: + [:s| + (s ~~ selectorOrNil + and: [(destClass >>> s) isValid]) ifTrue: + [destClass removeSelector: s]]. + + ^methodTimeStamp notNil + and: [(destClass >>> selectorOrNil) isValid + and: [(methodTimeStamp beginsWith: 'ancient') + or: [(self dateAndTimeFrom: (destClass >>> selectorOrNil) timeStamp) ~= (self dateAndTimeFrom: methodTimeStamp)]]]! Item was added: + ----- Method: SistaRegisterAllocatingCogit class>>syncCodeWithSistaCogit (in category 'class initialization') ----- + syncCodeWithSistaCogit + "Make sure that the SistaRegisterAllocatingCogit/SistaCogitClone combination is up-to-date w.r.t. SistaCogit. + - SistaCogitClone should have all methods in SistaCogit except those implemented in SistaRegisterAllocatingCogit. + This means that super sends in SistaCogitClone will be understood in SistaRegisterAllocatingCogit, not + SistaRegisterAllocatingCogit. + - newer methods in SistaCogitClone that are implemented in SistaRegisterAllocatingCogit should be moved up to + SistaRegisterAllocatingCogit becaude it means that we probably changed them in SistaCogitClone by mistake + and forgot to copy them up. + - the same goes for the class side, except for the intializeWithOptions: method which /should/ exist in both + SistaRegisterAllocatingCogit and SistaCogitClone, because it runs this initialization." + | syncAction | + syncAction := + [self syncCodeIn: SistaCogit with: SistaCogitClone leavingUnchanged: nil. + self syncCodeIn: SistaCogit class with: SistaCogitClone class leavingUnchanged: #initializeWithOptions:]. + ^(Smalltalk classNamed: #CurrentReadOnlySourceFiles) + ifNil: syncAction + ifNotNil: [:crosf| crosf cacheDuring: syncAction]! Item was removed: - ----- Method: VMClass class>>removeThreadedSubSystem (in category 'utilities') ----- - removeThreadedSubSystem - "VMClass removeQwaqPlugins. - VMClass removeThreadedSubSystem" - "For releasing/merging OSCog" - SystemChangeNotifier uniqueInstance doSilently: - [CogVMSimulator - removeSelector: #isThreadedVM; - removeSelector: #initializeThreadSupport; - removeSelector: #initialEnterSmalltalkExecutive; - removeSelector: #ensureMultiThreadingOverridesAreUpToDate. - (CogVMSimulator organization listAtCategoryNamed: #'multi-threading simulation switch') do: - [:s| CogVMSimulator removeSelector: s]. - CoInterpreterPrimitives - subclass: #CogVMSimulator - instanceVariableNames: CogVMSimulator instanceVariablesString - classVariableNames: CogVMSimulator classVariablesString - poolDictionaries: CogVMSimulator sharedPoolsString - category: CogVMSimulator category. - SystemOrganization removeSystemCategory: #'VMMaker-Multithreading'. - self class removeSelector: thisContext selector]. - (Smalltalk classNamed: #MCWorkingCopy) ifNotNil: - [:mcwc| - (mcwc forPackage: (MCPackage named: 'VMMaker')) modified: true]!

1 0

VM Maker: VMMaker.oscog-cb.2035.mcz
by commits＠source.squeak.org 12 Dec '16

12 Dec '16

ClementBera uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-cb.2035.mcz ==================== Summary ==================== Name: VMMaker.oscog-cb.2035 Author: cb Time: 12 December 2016, 7:37:09.935383 pm UUID: 8dd1f98f-643b-4db0-b770-ae057679bef9 Ancestors: VMMaker.oscog-eem.2034 Added support for BranchIfInstanceOf in addition to BranchIfNotInstanceOf by using the sign bit of extB as annotation. =============== Diff against VMMaker.oscog-eem.2034 =============== Item was added: + ----- Method: CogObjectRepresentationFor32BitSpur>>allImmediate:branchIf:instanceOfBehaviors:target: (in category 'sista support') ----- + allImmediate: immediateMask branchIf: reg instanceOfBehaviors: arrayObj target: targetFixUp + < inline: true> + <var: #targetFixUp type: #'AbstractInstruction *'> + self assert: immediateMask = objectMemory tagMask. + (self genJumpImmediate: reg) jmpTarget: targetFixUp. + ^0! Item was changed: ----- Method: CogObjectRepresentationFor32BitSpur>>allImmediate:branchIf:notInstanceOfBehaviors:target: (in category 'sista support') ----- allImmediate: immediateMask branchIf: reg notInstanceOfBehaviors: arrayObj target: targetFixUp - | jmpImmediate | < inline: true> <var: #targetFixUp type: #'AbstractInstruction *'> self assert: immediateMask = objectMemory tagMask. + (self genJumpNotImmediate: reg) jmpTarget: targetFixUp. - jmpImmediate := self genJumpNotImmediate: reg. - jmpImmediate jmpTarget: targetFixUp. ^0! Item was added: + ----- Method: CogObjectRepresentationFor32BitSpur>>branch2CasesIf:instanceOfBehaviors:target: (in category 'sista support') ----- + branch2CasesIf: reg instanceOfBehaviors: arrayObj target: targetFixUp + <inline: true> + self Jump: targetFixUp! Item was added: + ----- Method: CogObjectRepresentationFor32BitSpur>>branchIf:hasImmediateTag:target: (in category 'sista support') ----- + branchIf: reg hasImmediateTag: classIndex target: targetFixUp + <var: #targetFixUp type: #'AbstractInstruction *'> + | jmpImmediate| + <inline: true> + cogit MoveR: reg R: TempReg. + classIndex = objectMemory smallIntegerTag ifTrue: + [jmpImmediate := self genJumpSmallIntegerInScratchReg: TempReg]. + classIndex = objectMemory characterTag ifTrue: + [jmpImmediate := self genJumpCharacterInScratchReg: TempReg]. + jmpImmediate jmpTarget: targetFixUp! Item was added: + ----- Method: CogObjectRepresentationFor64BitSpur>>allImmediate:branchIf:instanceOfBehaviors:target: (in category 'sista support') ----- + allImmediate: immediateMask branchIf: reg instanceOfBehaviors: arrayObj target: targetFixUp + | tag1 tag2 | + <var: #targetFixUp type: #'AbstractInstruction *'> + immediateMask = objectMemory tagMask ifTrue: [(self genJumpImmediate: reg) jmpTarget: targetFixUp. ^0]. + "TempReg holds the rcvr tag" + "In this case one immediate tag out of the three is not present in arrayObj." + tag1 := objectMemory classTagForClass: (objectMemory fetchPointer: 0 ofObject: arrayObj). + tag2 := objectMemory classTagForClass: (objectMemory fetchPointer: 1 ofObject: arrayObj). + (tag1 = objectMemory smallIntegerTag or: [tag2 = objectMemory smallIntegerTag]) ifTrue: + [(self genJumpSmallIntegerInScratchReg: TempReg) jmpTarget: targetFixUp]. + (tag1 = objectMemory characterTag or: [tag2 = objectMemory characterTag]) ifTrue: + [(self genJumpCharacterInScratchReg: TempReg) jmpTarget: targetFixUp]. + (tag1 = objectMemory smallFloatTag or: [tag2 = objectMemory smallFloatTag]) ifTrue: + [(self genJumpSmallFloatInScratchReg: TempReg) jmpTarget: targetFixUp]. + ^0! Item was added: + ----- Method: CogObjectRepresentationFor64BitSpur>>branch2CasesIf:instanceOfBehaviors:target: (in category 'sista support') ----- + branch2CasesIf: reg instanceOfBehaviors: arrayObj target: targetFixUp + | classObj tag1 tag2 | + < inline: true> + + "look for the 2 tags requiring jmps" + 0 to: (objectMemory numSlotsOf: arrayObj) - 1 do: + [:i| + classObj := objectMemory fetchPointer: i ofObject: arrayObj. + (objectMemory isImmediateClass: classObj) + ifTrue: [ tag1 + ifNil: [tag1 := objectMemory classTagForClass: classObj ] + ifNotNil: [tag2 := objectMemory classTagForClass: classObj ] ] ]. + + (tag1 = objectMemory smallIntegerTag or: [tag2 = objectMemory smallIntegerTag]) ifTrue: + [(self genJumpSmallIntegerInScratchReg: TempReg) jmpTarget: targetFixUp]. + (tag1 = objectMemory characterTag or: [tag2 = objectMemory characterTag]) ifTrue: + [(self genJumpCharacterInScratchReg: TempReg) jmpTarget: targetFixUp]. + (tag1 = objectMemory smallFloatTag or: [tag2 = objectMemory smallFloatTag]) ifTrue: + [(self genJumpSmallFloatInScratchReg: TempReg) jmpTarget: targetFixUp]. + ^ 0! Item was added: + ----- Method: CogObjectRepresentationFor64BitSpur>>branchIf:hasImmediateTag:target: (in category 'sista support') ----- + branchIf: reg hasImmediateTag: classIndex target: targetFixUp + <var: #targetFixUp type: #'AbstractInstruction *'> + | jmpImmediate| + <inline: true> + cogit MoveR: reg R: TempReg. + classIndex = objectMemory smallIntegerTag ifTrue: + [jmpImmediate := self genJumpSmallIntegerInScratchReg: TempReg]. + classIndex = objectMemory characterTag ifTrue: + [jmpImmediate := self genJumpCharacterInScratchReg: TempReg]. + classIndex = objectMemory smallFloatTag ifTrue: + [jmpImmediate := self genJumpSmallFloatInScratchReg: TempReg]. + jmpImmediate jmpTarget: targetFixUp! Item was added: + ----- Method: CogObjectRepresentationForSpur>>branchIf:instanceOfBehavior:target: (in category 'sista support') ----- + branchIf: reg instanceOfBehavior: classObj target: targetFixUp + "Generate a branch if reg is an instance of classObj, otherwise fall- + through. Cannot change the value of reg (may be used afterwards)." + | classIndex jmp | + <inline: true> + <var: #targetFixUp type: #'AbstractInstruction *'> + <var: #jmp type: #'AbstractInstruction *'> + classIndex := objectMemory classTagForClass: classObj. + (objectMemory isImmediateClass: classObj) + ifTrue: + [self branchIf: reg hasImmediateTag: classIndex target: targetFixUp ] + ifFalse: + [jmp := (self genJumpImmediate: reg) . + self genGetClassIndexOfNonImm: reg into: TempReg. + self genCmpClassIndex: classIndex R: TempReg. + cogit JumpZero: targetFixUp. + jmp jmpTarget: cogit Label ]. + ^0! Item was added: + ----- Method: CogObjectRepresentationForSpur>>branchIf:instanceOfBehaviors:target: (in category 'sista support') ----- + branchIf: reg instanceOfBehaviors: arrayObj target: targetFixUp + "Generate a branch if reg is an instance of any of the classes in arrayObj, + otherwise fall-through. reg should not be edited." + + | allImmediate noneImmediate immediateMask numNonImmediates classObj | + <var: #targetFixUp type: #'AbstractInstruction *'> + + "let me tell you all about it, let me falsify" + allImmediate := true. noneImmediate := true. immediateMask := 0. numNonImmediates := 0. + 0 to: (objectMemory numSlotsOf: arrayObj) - 1 do: + [:i| + classObj := objectMemory fetchPointer: i ofObject: arrayObj. + (objectMemory isImmediateClass: classObj) + ifTrue: + [noneImmediate := false. + immediateMask := immediateMask + (objectMemory classTagForClass: classObj)] + ifFalse: + [allImmediate := false. + numNonImmediates := numNonImmediates + 1]]. + + noneImmediate ifTrue: [ ^ self noneImmediateBranchIf: reg instanceOfBehaviors: arrayObj target: targetFixUp ]. + + allImmediate ifTrue: [ ^ self allImmediate: immediateMask branchIf: reg instanceOfBehaviors: arrayObj target: targetFixUp ]. + + ^ self mixed: numNonImmediates branchIf: reg instanceOfBehaviors: arrayObj target: targetFixUp! Item was added: + ----- Method: CogObjectRepresentationForSpur>>mixed:branchIf:instanceOfBehaviors:target: (in category 'sista support') ----- + mixed: numNonImmediates branchIf: reg instanceOfBehaviors: arrayObj target: targetFixUp + | jmpImmediate numCases classObj index jmp | + <var: #label type: #'AbstractInstruction *'> + <var: #jmpImmediate type: #'AbstractInstruction *'> + <var: #jmp type: #'AbstractInstruction *'> + <var: #targetFixUp type: #'AbstractInstruction *'> + numCases := objectMemory numSlotsOf: arrayObj. + jmpImmediate := self genJumpImmediate: reg. + + "Rcvr is non immediate" + self genGetClassIndexOfNonImm: reg into: TempReg. + index := 0. + 0 to: numCases - 1 do: + [:i| + classObj := objectMemory fetchPointer: i ofObject: arrayObj. + (objectMemory isImmediateClass: classObj) ifFalse: [ + self genCmpClassIndex: (objectMemory classTagForClass: classObj) R: TempReg. + cogit JumpZero: targetFixUp. + index := index + 1 ] ]. + jmp := cogit Jump: 0. + + "Rcvr is immediate" + jmpImmediate jmpTarget: cogit Label. + numCases - numNonImmediates "num Immediates allowed" + caseOf: + {[ 1 ] -> [ "1 immediate needs to jump. Find it and jump." + 0 to: numCases - 1 do: + [ :j | + classObj := objectMemory fetchPointer: j ofObject: arrayObj. + (objectMemory isImmediateClass: classObj) ifTrue: [ + self branchIf: reg hasImmediateTag: (objectMemory classTagForClass: classObj) target: targetFixUp ] ] ] . + [ 2 ] -> [ "2 immediates needs to jump" + self branch2CasesIf: reg instanceOfBehaviors: arrayObj target: targetFixUp ] . + [ 3 ] -> [ "all 3 needs to jump" self Jump: targetFixUp ] }. + + jmp jmpTarget: self Label. + + ^ 0 + ! Item was added: + ----- Method: CogObjectRepresentationForSpur>>noneImmediateBranchIf:instanceOfBehaviors:target: (in category 'sista support') ----- + noneImmediateBranchIf: reg instanceOfBehaviors: arrayObj target: targetFixUp + "All classes in arrayObj are not immediate" + | classObj jmp | + <var: #targetFixUp type: #'AbstractInstruction *'> + <var: #label type: #'AbstractInstruction *'> + <var: #jmp type: #'AbstractInstruction *'> + jmp := self genJumpImmediate: reg. + self genGetClassIndexOfNonImm: reg into: TempReg. + 0 to: (objectMemory numSlotsOf: arrayObj) - 1 do: + [:i| + classObj := objectMemory fetchPointer: i ofObject: arrayObj. + self genCmpClassIndex: (objectMemory classTagForClass: classObj) R: TempReg. + cogit JumpZero: targetFixUp ]. + jmp jmpTarget: self Label. + ^0! Item was changed: ----- Method: SistaCogit>>genExtJumpIfNotInstanceOfBehaviorsBytecode (in category 'bytecode generators') ----- genExtJumpIfNotInstanceOfBehaviorsBytecode "SistaV1: * 254 11111110 kkkkkkkk jjjjjjjj branch If Not Instance Of Behavior/Array Of Behavior kkkkkkkk (+ Extend A * 256, where Extend A >= 0) distance jjjjjjjj (+ Extend B * 256, where Extend B >= 0)" + | reg literal distance targetFixUp inverse | - | reg literal distance targetFixUp | "We loose the information of in which register is stack top when jitting the branch target so we need to flush everything. We could use a fixed register here...." reg := self allocateRegForStackEntryAt: 0. self ssTop popToReg: reg. self ssFlushTo: simStackPtr. "flushed but the value is still in reg" self genPopStackBytecode. literal := self getLiteral: (extA * 256 + byte1). extA := 0. + extB < 0 + ifTrue: [extB := extB + 128. inverse := true] + ifFalse: [inverse := false]. distance := extB * 256 + byte2. extB := 0. targetFixUp := self cCoerceSimple: (self ensureFixupAt: bytecodePC + 3 + distance - initialPC) to: #'AbstractInstruction *'. + inverse + ifFalse: + [(objectMemory isArrayNonImm: literal) + ifTrue: [objectRepresentation branchIf: reg notInstanceOfBehaviors: literal target: targetFixUp] + ifFalse: [objectRepresentation branchIf: reg notInstanceOfBehavior: literal target: targetFixUp] ] + ifTrue: + [(objectMemory isArrayNonImm: literal) + ifTrue: [objectRepresentation branchIf: reg instanceOfBehaviors: literal target: targetFixUp] + ifFalse: [objectRepresentation branchIf: reg instanceOfBehavior: literal target: targetFixUp]]. - - (objectMemory isArrayNonImm: literal) - ifTrue: [objectRepresentation branchIf: reg notInstanceOfBehaviors: literal target: targetFixUp] - ifFalse: [objectRepresentation branchIf: reg notInstanceOfBehavior: literal target: targetFixUp]. + + ^0! Item was changed: ----- Method: StackInterpreter>>extJumpIfNotInstanceOfBehaviorsBytecode (in category 'sista bytecodes') ----- extJumpIfNotInstanceOfBehaviorsBytecode "254 11111110 kkkkkkkk jjjjjjjj branch If Not Instance Of Behavior/Array Of Behavior kkkkkkkk (+ Extend A * 256, where Extend A >= 0) distance jjjjjjjj (+ Extend B * 256, where Extend B >= 0)" + | tosClassTag literal distance inverse | - | tosClassTag literal distance | SistaVM ifFalse: [^self respondToUnknownBytecode]. + extB < 0 + ifTrue: [extB := extB + 128. inverse := true] + ifFalse: [inverse := false]. tosClassTag := objectMemory fetchClassTagOf: self internalPopStack. literal := self literal: extA << 8 + self fetchByte. distance := extB << 8 + self fetchByte. extA := 0. extB := 0. (objectMemory isArrayNonImm: literal) ifTrue: [0 to: (objectMemory numSlotsOf: literal) asInteger - 1 do: [:i | tosClassTag = (objectMemory rawClassTagForClass: (objectMemory fetchPointer: i ofObject: literal)) + ifTrue: [ + inverse ifTrue: [ localIP := localIP + distance ]. + ^ self fetchNextBytecode ] ]. + inverse ifFalse: [localIP := localIP + distance]. - ifTrue: [ ^ self fetchNextBytecode ] ]. - localIP := localIP + distance. ^ self fetchNextBytecode] ifFalse: [tosClassTag ~= (objectMemory rawClassTagForClass: literal) ifTrue: + [inverse ifFalse: [localIP := localIP + distance]. - [localIP := localIP + distance. ^ self fetchNextBytecode]]. + inverse ifTrue: [localIP := localIP + distance]. self fetchNextBytecode!

1 0

VM Maker: VMMaker-dtl.388.mcz
by commits＠source.squeak.org 11 Dec '16

11 Dec '16

David T. Lewis uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker-dtl.388.mcz ==================== Summary ==================== Name: VMMaker-dtl.388 Author: dtl Time: 11 December 2016, 11:42:49.558 am UUID: 09c15fd6-eb5a-416d-b481-8bdec834b668 Ancestors: VMMaker-dtl.387 VMMaker 4.15.10 - Fix 'debug it' from the menu for V3 images. Fix primitiveChangeClass by factoring fetchClassOfNonImm: into a version for ClassicObjectMemory that calls fetchClassofNonInt: and a version for NewObjectMemory that retains the oscog implementation. TODO: The primitive now works as expected for interpreter VM, but fetchClassOfNonImm: should be revisited for StackInterpreter on V3 image (may depend on Spur logic). =============== Diff against VMMaker-dtl.387 =============== Item was added: + ----- Method: ClassicObjectMemory>>fetchClassOfNonImm: (in category 'object access') ----- + fetchClassOfNonImm: oop + "Only integers are immediate" + <inline: true> + ^self fetchClassOfNonInt: oop! Item was added: + ----- Method: NewObjectMemory>>fetchClassOfNonImm: (in category 'object access') ----- + fetchClassOfNonImm: oop + | ccIndex | + <inline: true> + ^(ccIndex := (self compactClassIndexOf: oop)) = 0 + ifTrue: [(self classHeader: oop) bitAnd: self allButTypeMask] + ifFalse: [self compactClassAt: ccIndex]! Item was changed: ----- Method: ObjectMemory>>fetchClassOfNonImm: (in category 'object access') ----- + fetchClassOfNonImm: oop + ^self subclassResponsibility! - fetchClassOfNonImm: oop - | ccIndex | - <inline: true> - ^(ccIndex := (self compactClassIndexOf: oop)) = 0 - ifTrue: [(self classHeader: oop) bitAnd: self allButTypeMask] - ifFalse: [self compactClassAt: ccIndex]! Item was changed: ----- Method: VMMaker class>>versionString (in category 'version testing') ----- versionString "VMMaker versionString" + ^'4.15.10'! - ^'4.15.9'!

1 0

[OpenSmalltalk/opensmalltalk-vm] 8a77b2: CogVM source as per Name: VMMaker.oscog-eem.2034
by GitHub 11 Dec '16

11 Dec '16

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 8a77b2517d9ec3d467cb0f1ae427e94c4a5eeb10 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/8a77b2517d9ec3d467… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2016-12-10 (Sat, 10 Dec 2016) Changed paths: M nsspur64src/vm/cogit.h M nsspur64src/vm/cogitX64.c M nsspur64src/vm/cointerp.c M nsspur64src/vm/cointerp.h M nsspur64src/vm/gcc3x-cointerp.c M nsspursrc/vm/cogit.h M nsspursrc/vm/cogitARMv5.c M nsspursrc/vm/cogitIA32.c M nsspursrc/vm/cogitMIPSEL.c M nsspursrc/vm/cointerp.c M nsspursrc/vm/cointerp.h M nsspursrc/vm/gcc3x-cointerp.c M nsspurstack64src/vm/gcc3x-interp.c M nsspurstack64src/vm/interp.c M nsspurstacksrc/vm/gcc3x-interp.c M nsspurstacksrc/vm/interp.c M spur64src/vm/cogit.h M spur64src/vm/cogitX64.c M spur64src/vm/cointerp.c M spur64src/vm/cointerp.h M spur64src/vm/gcc3x-cointerp.c M spursista64src/vm/cogit.h M spursista64src/vm/cogitX64.c M spursista64src/vm/cointerp.c M spursista64src/vm/cointerp.h M spursista64src/vm/gcc3x-cointerp.c M spursistasrc/vm/cogit.h M spursistasrc/vm/cogitARMv5.c M spursistasrc/vm/cogitIA32.c M spursistasrc/vm/cogitMIPSEL.c M spursistasrc/vm/cointerp.c M spursistasrc/vm/cointerp.h M spursistasrc/vm/gcc3x-cointerp.c M spursrc/vm/cogit.h M spursrc/vm/cogitARMv5.c M spursrc/vm/cogitIA32.c M spursrc/vm/cogitMIPSEL.c M spursrc/vm/cointerp.c M spursrc/vm/cointerp.h M spursrc/vm/gcc3x-cointerp.c M spurstack64src/vm/gcc3x-interp.c M spurstack64src/vm/interp.c M spurstacksrc/vm/gcc3x-interp.c M spurstacksrc/vm/interp.c M src/vm/cogit.h M src/vm/cogitARMv5.c M src/vm/cogitIA32.c M src/vm/cogitMIPSEL.c M src/vm/cointerp.c M src/vm/cointerp.h M src/vm/cointerpmt.c M src/vm/cointerpmt.h M src/vm/gcc3x-cointerp.c M src/vm/gcc3x-cointerpmt.c M stacksrc/vm/gcc3x-interp.c M stacksrc/vm/interp.c Log Message: ----------- CogVM source as per Name: VMMaker.oscog-eem.2034 Fix some assert fails, in particular ones arising in StackToRegisterMappingCogit from first-pass compiling of V3Closures blocks with initial temp := nil statements (which are ambiguous with the alas explicit push nils to init temps). This because Cadence regression tests are run on assert VMs and hence we can't tolerate false positives. More debugging for stack imbalance on callback return; remember the stack pointer on return from a callback.

1 0

VM Maker: VMMaker.oscog-eem.2034.mcz
by commits＠source.squeak.org 11 Dec '16

11 Dec '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.2034.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.2034 Author: eem Time: 10 December 2016, 6:33:12.743145 pm UUID: ff192a4b-8ebc-4734-9e4e-cdc301d6c9e0 Ancestors: VMMaker.oscog-eem.2033 Fix some assert fails, in particular ones arising in StackToRegisterMappingCogit from first-pass compiling of V3Closures blocks with initial temp := nil statements (which are ambiguous with the alas explicit push nils to init temps). This because Cadence regression tests are run on assert VMs and hence we can't tolerate false positives. More debugging for stack imbalance on callback return; remember the stack pointer on return from a callback. In the simulator, handle dialog cancel as end-of-file. =============== Diff against VMMaker.oscog-eem.2033 =============== Item was changed: ----- Method: FakeStdinStream>>next (in category 'accessing') ----- next "Answer the next object in the Stream represented by the receiver. If there are no more elements in the stream fill up the buffer by prompting for input" | sem threadIndex inputLine next | position >= readLimit ifTrue: [simulator isThreadedVM ifTrue: ["(simulator cogit singleStep not and: [UIManager confirm: 'Single step?']) ifTrue: [simulator cogit singleStep: true]." threadIndex := simulator disownVM: DisownVMLockOutFullGC. simulator forceInterruptCheckFromHeartbeat. sem := Semaphore new. WorldState addDeferredUIMessage: [inputLine := UIManager default request: 'Input please!!'. sem signal]. sem wait] ifFalse: "simulate line-oriented input" [inputLine := FillInTheBlankMorph request: 'Input please!!' initialAnswer: '' centerAt: ActiveHand cursorPoint inWorld: ActiveWorld onCancelReturn: nil acceptOnCR: true. + inputLine ifNil: [self atEnd: true. ^nil]]. - inputLine ifNil: [self halt]]. collection size <= inputLine size ifTrue: [collection := collection species new: inputLine size + 1]. collection replaceFrom: 1 to: inputLine size with: inputLine startingAt: 1; at: (readLimit := inputLine size + 1) put: Character lf. position := 0. simulator isThreadedVM ifTrue: [simulator ownVM: threadIndex]]. next := collection at: (position := position + 1). "This is set temporarily to allow (FilePluginSimulator>>#sqFile:Read:Into:At: to brwak out of its loop. sqFile:Read:Into:At: resets it on the way out." atEnd := position >= readLimit. ^next " This does it with workspaces: | ws r s | s := Semaphore new. ws := Workspace new contents: ''. ws acceptAction: [:t| r := t asString. s signal]. [ws openLabel: 'Yo!!'; shouldStyle: false. (ws dependents detect: [:dep | dep isKindOf: PluggableTextMorph] ifNone: [nil]) ifNotNil: [:textMorph| textMorph acceptOnCR: true; hasUnacceptedEdits: true]] fork. Processor activeProcess == Project uiProcess ifTrue: [[r isNil] whileTrue: [World doOneCycle]] ifFalse: [s wait]. ws topView delete. s wait. s signal. r"! Item was changed: ----- Method: FilePluginSimulator>>sqFile:Read:Into:At: (in category 'simulation') ----- sqFile: file Read: count Into: byteArrayIndexArg At: startIndex | interpreter byteArrayIndex | interpreter := interpreterProxy interpreter. byteArrayIndex := byteArrayIndexArg isInteger ifTrue: [byteArrayIndexArg] ifFalse: [byteArrayIndexArg cPtrAsOop]. [[startIndex to: startIndex + count - 1 do: [ :i | file atEnd ifTrue: [(file isKindOf: FakeStdinStream) ifTrue: [file atEnd: false]. ^i - startIndex]. interpreter byteAt: byteArrayIndex + i + put: (file next ifNil: [(file isKindOf: FakeStdinStream) ifTrue: [^0]] ifNotNil: [:c| c asInteger])]] - put: file next asInteger]] on: Error do: [:ex| (file isKindOf: TranscriptStream) ifFalse: [ex pass]. ^0]] ensure: [self recordStateOf: file]. ^count! Item was changed: ----- Method: InterpreterPrimitives>>noInlineSigned32BitValueGutsOf: (in category 'primitive support') ----- noInlineSigned32BitValueGutsOf: oop "Convert the given object into an integer value. The object may be a four-byte LargeInteger." | value negative ok magnitude | <notOption: #Spur64BitMemoryManager> <inline: false> <returnTypeC: #int> <var: #value type: #int> <var: #magnitude type: #'unsigned int'> self deny: objectMemory hasSixtyFourBitImmediates. + self deny: (objectMemory isIntegerObject: oop). - self deny: (objectMemory isIntegerValue: oop). (objectMemory isNonIntegerImmediate: oop) ifTrue: [self primitiveFail. ^0]. ok := objectMemory isClassOfNonImm: oop equalTo: (objectMemory splObj: ClassLargePositiveInteger) compactClassIndex: ClassLargePositiveIntegerCompactIndex. ok ifTrue: [negative := false] ifFalse: [negative := true. ok := objectMemory isClassOfNonImm: oop equalTo: (objectMemory splObj: ClassLargeNegativeInteger) compactClassIndex: ClassLargeNegativeIntegerCompactIndex. ok ifFalse: [self primitiveFail. ^0]]. (objectMemory numBytesOfBytes: oop) > 4 ifTrue: [^self primitiveFail]. magnitude := self cCoerceSimple: (objectMemory byteSwapped32IfBigEndian: (objectMemory fetchLong32: 0 ofObject: oop)) to: #'unsigned int'. (negative ifTrue: [magnitude > 16r80000000] ifFalse: [magnitude >= 16r80000000]) ifTrue: [self primitiveFail. ^0]. negative ifTrue: [value := 0 - magnitude] ifFalse: [value := magnitude]. ^value! Item was changed: InterpreterPrimitives subclass: #StackInterpreter + instanceVariableNames: 'currentBytecode bytecodeSetSelector localFP localIP localSP stackLimit stackPage stackPages method instructionPointer stackPointer framePointer localReturnValue localAbsentReceiver localAbsentReceiverOrZero extA extB primitiveFunctionPointer methodCache nsMethodCache atCache lkupClassTag lkupClass methodDictLinearSearchLimit highestRunnableProcessPriority nextWakeupUsecs nextPollUsecs inIOProcessEvents interruptKeycode interruptPending savedWindowSize imageHeaderFlags fullScreenFlag deferDisplayUpdates pendingFinalizationSignals extraVMMemory interpreterProxy showSurfaceFn primitiveTable primitiveAccessorDepthTable externalPrimitiveTable externalPrimitiveTableFirstFreeIndex overflowedPage extraFramesToMoveOnOverflow globalSessionID jmpBuf jmpDepth suspendedCallbacks suspendedMethods numStackPages desiredNumStackPages desiredEdenBytes classNameIndex thisClassIndex metaclassNumSlots interruptCheckChain suppressHeartbeatFlag breakSelector breakSelectorLength l ongRunningPrimitiveCheckMethod longRunningPrimitiveCheckSemaphore longRunningPrimitiveStartUsecs longRunningPrimitiveStopUsecs longRunningPrimitiveGCUsecs longRunningPrimitiveCheckSequenceNumber longRunningPrimitiveSignalUndelivered checkAllocFiller tempOop tempOop2 tempOop3 theUnknownShort the2ndUnknownShort imageFloatsBigEndian maxExtSemTabSizeSet lastMethodCacheProbeWrite gcSemaphoreIndex classByteArrayCompactIndex checkedPluginName statForceInterruptCheck statStackOverflow statStackPageDivorce statCheckForEvents statProcessSwitch statIOProcessEvents statPendingFinalizationSignals nativeSP nativeStackPointer lowcodeCalloutState shadowCallStackPointer debugCallbackPath callbackReturnSP' - instanceVariableNames: 'currentBytecode bytecodeSetSelector localFP localIP localSP stackLimit stackPage stackPages method instructionPointer stackPointer framePointer localReturnValue localAbsentReceiver localAbsentReceiverOrZero extA extB primitiveFunctionPointer methodCache nsMethodCache atCache lkupClassTag lkupClass methodDictLinearSearchLimit highestRunnableProcessPriority nextWakeupUsecs nextPollUsecs inIOProcessEvents interruptKeycode interruptPending savedWindowSize imageHeaderFlags fullScreenFlag deferDisplayUpdates pendingFinalizationSignals extraVMMemory interpreterProxy showSurfaceFn primitiveTable primitiveAccessorDepthTable externalPrimitiveTable externalPrimitiveTableFirstFreeIndex overflowedPage extraFramesToMoveOnOverflow globalSessionID jmpBuf jmpDepth suspendedCallbacks suspendedMethods numStackPages desiredNumStackPages desiredEdenBytes classNameIndex thisClassIndex metaclassNumSlots interruptCheckChain suppressHeartbeatFlag breakSelector breakSelectorLength l ongRunningPrimitiveCheckMethod longRunningPrimitiveCheckSemaphore longRunningPrimitiveStartUsecs longRunningPrimitiveStopUsecs longRunningPrimitiveGCUsecs longRunningPrimitiveCheckSequenceNumber longRunningPrimitiveSignalUndelivered checkAllocFiller tempOop tempOop2 tempOop3 theUnknownShort the2ndUnknownShort imageFloatsBigEndian maxExtSemTabSizeSet lastMethodCacheProbeWrite gcSemaphoreIndex classByteArrayCompactIndex checkedPluginName statForceInterruptCheck statStackOverflow statStackPageDivorce statCheckForEvents statProcessSwitch statIOProcessEvents statPendingFinalizationSignals nativeSP nativeStackPointer lowcodeCalloutState shadowCallStackPointer debugCallbackPath' classVariableNames: 'AccessModifierPrivate AccessModifierProtected AccessModifierPublic AltBytecodeEncoderClassName AltLongStoreBytecode AlternateHeaderHasPrimFlag AlternateHeaderIsOptimizedFlag AlternateHeaderNumLiteralsMask AtCacheFixedFields AtCacheFmt AtCacheMask AtCacheOop AtCacheSize AtCacheTotalSize AtPutBase BytecodeEncoderClassName BytecodeTable CacheProbeMax DirBadPath DirEntryFound DirNoMoreEntries DumpStackOnLowSpace EnclosingMixinIndex EnclosingObjectIndex EnforceAccessControl FailImbalancedPrimitives LongStoreBytecode MaxExternalPrimitiveTableSize MaxJumpBuf MaxPrimitiveIndex MaxQuickPrimitiveIndex MethodHeaderArgCountShift MethodHeaderFlagBitPosition MethodHeaderTempCountShift MixinIndex PrimNumberDoExternalCall PrimNumberExternalCall PrimNumberFFICall PrimitiveExternalCallIndex PrimitiveTable StackPageReachedButUntraced StackPageTraceInvalid StackPageTraced StackPageUnreached V3PrimitiveBitsMask' poolDictionaries: 'VMBasicConstants VMBytecodeConstants VMMethodCacheConstants VMObjectIndices VMSpurObjectRepresentationConstants VMSqueakClassIndices VMStackFrameOffsets' category: 'VMMaker-Interpreter'! !StackInterpreter commentStamp: 'eem 12/5/2014 11:32' prior: 0! This class is a complete implementation of the Smalltalk-80 virtual machine, derived originally from the Blue Book specification but quite different in some areas. This VM supports Closures but *not* old-style BlockContexts. It has been modernized with 32-bit pointers, better management of Contexts (see next item), and attention to variable use that allows the CCodeGenerator (qv) to keep, eg, the instruction pointer and stack pointer in registers as well as keeping most simple variables in a global array that seems to improve performance for most platforms. The VM does not use Contexts directly. Instead Contexts serve as proxies for a more conventional stack format that is invisible to the image. There is considerable explanation at http://www.mirandabanda.org/cogblog/2009/01/14/under-cover-contexts-and-the…. The VM maintains a fixed-size stack zone divided into pages, each page being capable of holding several method/block activations. A send establishes a new frame in the current stack page, a return returns to the previous frame. This eliminates allocation/deallocation of contexts and the moving of receiver and arguments from caller to callee on each send/return. Contexts are created lazily when an activation needs a context (creating a block, explicit use of thisContext, access to sender when sender is a frame, or linking of stack pages together). Contexts are either conventional and heap-resident ("single") or "married" and serve as proxies for their corresponding frame or "widowed", meaning that their spouse f rame has been returned from (died). A married context is specially marked (more details in the code) and refers to its frame. Likewise a married frame is specially marked and refers to its context. In addition to SmallInteger arithmetic and Floats, the VM supports logic on 32-bit PositiveLargeIntegers, thus allowing it to simulate itself much more effectively than would otherwise be the case. StackInterpreter and subclasses support multiple memory managers. Currently there are two. NewMemoryManager is a slightly refined version of ObjectMemory, and is the memory manager and garbage collector for the original Squeak object representation as described in "Back to the Future The Story of Squeak, A Practical Smalltalk Written in Itself", see http://ftp.squeak.org/docs/OOPSLA.Squeak.html. Spur is a faster, more regular object representation that is designed for more performance and functionality, and to have a common header format for both 32-bit and 64-bit versions. You can read about it in SpurMemoryManager's class comment. There is also a video of a presentation at ESUG 2014 (https://www.youtube.com/watch?v=k0nBNS1aHZ4), along with slides (http://www.slideshare.net/esug/spur-a-new-object-representation-for-cog?rel…).! Item was changed: ----- Method: StackInterpreter class>>mustBeGlobal: (in category 'translation') ----- mustBeGlobal: var "Answer if a variable must be global and exported. Used for inst vars that are accessed from VM support code." ^(super mustBeGlobal: var) or: [(self objectMemoryClass mustBeGlobal: var) or: [(#('interpreterProxy' 'interpreterVersion' 'inIOProcessEvents' 'deferDisplayUpdates' 'extraVMMemory' 'showSurfaceFn' 'desiredNumStackPages' 'desiredEdenBytes' 'breakSelector' 'breakSelectorLength' 'sendTrace' 'checkAllocFiller' 'checkedPluginName' + 'suppressHeartbeatFlag' 'debugCallbackPath' 'callbackReturnSP') includes: var) - 'suppressHeartbeatFlag' 'debugCallbackPath') includes: var) or: [ "This allows slow machines to define bytecodeSetSelector as 0 to avoid the interpretation overhead." MULTIPLEBYTECODESETS not and: [var = 'bytecodeSetSelector']]]]! Item was added: + ----- Method: StackInterpreter>>frameLastArgumentOffset (in category 'frame access') ----- + frameLastArgumentOffset + "Answer the offset in bytes from the frame pointer to the last argument, + which is simply the address of the word above the saved ip. See the + diagram in StackInterpreter class>>initializeFrameIndices." + <inline: true> + ^FoxCallerSavedIP + objectMemory wordSize! Item was changed: ----- Method: StackInterpreter>>returnAs:ThroughCallback:Context: (in category 'callback support') ----- returnAs: returnTypeOop ThroughCallback: vmCallbackContext Context: callbackMethodContext "callbackMethodContext is an activation of invokeCallback:[stack:registers:jmpbuf:]. Its sender is the VM's state prior to the callback. Reestablish that state (via longjmp), and mark callbackMethodContext as dead." <export: true> <var: #vmCallbackContext type: #'VMCallbackContext *'> | calloutMethodContext theFP thePage | <var: #theFP type: #'char *'> <var: #thePage type: #'StackPage *'> debugCallbackPath := 0. ((self isIntegerObject: returnTypeOop) and: [self isLiveContext: callbackMethodContext]) ifFalse: [debugCallbackPath := 1. ^false]. calloutMethodContext := self externalInstVar: SenderIndex ofContext: callbackMethodContext. (self isLiveContext: calloutMethodContext) ifFalse: [debugCallbackPath := 2. ^false]. debugCallbackPath := 4. "We're about to leave this stack page; must save the current frame's instructionPointer." self push: instructionPointer. self externalWriteBackHeadFramePointers. "Mark callbackMethodContext as dead; the common case is that it is the current frame. We go the extra mile for the debugger." (self isSingleContext: callbackMethodContext) ifTrue: [self markContextAsDead: callbackMethodContext. debugCallbackPath := debugCallbackPath bitOr: 8] ifFalse: [debugCallbackPath := debugCallbackPath bitOr: 16. theFP := self frameOfMarriedContext: callbackMethodContext. framePointer = theFP "common case" ifTrue: [debugCallbackPath := debugCallbackPath bitOr: 32. (self isBaseFrame: theFP) ifTrue: [stackPages freeStackPage: stackPage. debugCallbackPath := debugCallbackPath bitOr: 64] ifFalse: "calloutMethodContext is immediately below on the same page. Make it current." [debugCallbackPath := debugCallbackPath bitOr: 128. instructionPointer := (self frameCallerSavedIP: framePointer) asUnsignedInteger. stackPointer := framePointer + (self frameStackedReceiverOffset: framePointer) + objectMemory wordSize. framePointer := self frameCallerFP: framePointer. self setMethod: (self frameMethodObject: framePointer). self restoreCStackStateForCallbackContext: vmCallbackContext. + callbackReturnSP := stackPointer. "N.B. siglongjmp is defines as _longjmp on non-win32 platforms. This matches the use of _setjmp in ia32abicc.c." self siglong: vmCallbackContext trampoline jmp: (self integerValueOf: returnTypeOop). ^true]] ifFalse: [debugCallbackPath := debugCallbackPath bitOr: 256. self externalDivorceFrame: theFP andContext: callbackMethodContext. self markContextAsDead: callbackMethodContext]]. "Make the calloutMethodContext the active frame. The case where calloutMethodContext is immediately below callbackMethodContext on the same page is handled above." (self isStillMarriedContext: calloutMethodContext) ifTrue: [debugCallbackPath := debugCallbackPath bitOr: 512. theFP := self frameOfMarriedContext: calloutMethodContext. thePage := stackPages stackPageFor: theFP. "findSPOf:on: points to the word beneath the instructionPointer, but there is no instructionPointer on the top frame of the current page." self assert: thePage ~= stackPage. stackPointer := (self findSPOf: theFP on: thePage) - objectMemory wordSize. framePointer := theFP] ifFalse: [debugCallbackPath := debugCallbackPath bitOr: 1024. thePage := self makeBaseFrameFor: calloutMethodContext. framePointer := thePage headFP. stackPointer := thePage headSP]. instructionPointer := self popStack. self setMethod: (objectMemory fetchPointer: MethodIndex ofObject: calloutMethodContext). self setStackPageAndLimit: thePage. self restoreCStackStateForCallbackContext: vmCallbackContext. debugCallbackPath := debugCallbackPath bitOr: 2048. + callbackReturnSP := stackPointer. "N.B. siglongjmp is defines as _longjmp on non-win32 platforms. This matches the use of _setjmp in ia32abicc.c." self siglong: vmCallbackContext trampoline jmp: (self integerValueOf: returnTypeOop). "NOTREACHED" ^true! 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 useTwoPaths currentCallCleanUpSize simNativeStack simNativeStackPtr simNativeSpillBase simNativeStackSize hasNativeFrame blockPass' - instanceVariableNames: 'prevBCDescriptor numPushNilsFunction pushNilSizeFunction methodOrBlockNumTemps regArgsHaveBeenPushed simSelf simStack simStackPtr simSpillBase optStatus ceCallCogCodePopReceiverArg0Regs ceCallCogCodePopReceiverArg1Arg0Regs methodAbortTrampolines picAbortTrampolines picMissTrampolines ceCall0ArgsPIC ceCall1ArgsPIC ceCall2ArgsPIC debugStackPointers debugFixupBreaks realCECallCogCodePopReceiverArg0Regs realCECallCogCodePopReceiverArg1Arg0Regs deadCode useTwoPaths currentCallCleanUpSize simNativeStack simNativeStackPtr simNativeSpillBase simNativeStackSize hasNativeFrame' classVariableNames: 'NeedsMergeFixupFlag NeedsNonMergeFixupFlag' poolDictionaries: 'CogCompilationConstants VMMethodCacheConstants VMObjectIndices VMStackFrameOffsets' category: 'VMMaker-JIT'! StackToRegisterMappingCogit class instanceVariableNames: 'numPushNilsFunction pushNilSizeFunction'! !StackToRegisterMappingCogit commentStamp: 'eem 6/1/2016 14:50' 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> useTwoPaths <Boolean> 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 useTwoPaths - a variable controlling whether to create two paths through a method based on the existence of inst var stores. With immutability this causes a frameless path to be generated if an otherwise frameless method is frameful simply because of inst var stores. In this case the test to take the first frameless path is if the receiver is not immutable. Without immutability, if a frameless method contains two or more inst var stores, the first path will be code with no store check, chosen by a single check for the receiver being in new space. ! StackToRegisterMappingCogit class instanceVariableNames: 'numPushNilsFunction pushNilSizeFunction'! Item was changed: ----- Method: StackToRegisterMappingCogit>>compileBlockBodies (in category 'compile abstract instructions') ----- compileBlockBodies <inline: false> | result compiledBlocksCount blockStart savedNeedsFrame savedNumArgs savedNumTemps initialStackPtr initialOpcodeIndex initialIndexOfIRC initialCounterIndex | <var: #blockStart type: #'BlockStart *'> self assert: blockCount > 0. "scanBlock: in compileBlockEntry: sets both of these appropriately for each block." savedNeedsFrame := needsFrame. savedNumArgs := methodOrBlockNumArgs. savedNumTemps := methodOrBlockNumTemps. inBlock := InVanillaBlock. compiledBlocksCount := 0. [compiledBlocksCount < blockCount] whileTrue: + [blockPass := 1. + blockStart := self blockStartAt: compiledBlocksCount. - [blockStart := self blockStartAt: compiledBlocksCount. (result := self scanBlock: blockStart) < 0 ifTrue: [^result]. initialOpcodeIndex := opcodeIndex. initialCounterIndex := self maybeCounterIndex."for SistaCogit" literalsManager saveForBlockCompile. NewspeakVM ifTrue: [initialIndexOfIRC := indexOfIRC]. [self compileBlockEntry: blockStart. initialStackPtr := simStackPtr. (result := self compileAbstractInstructionsFrom: blockStart startpc + (self pushNilSize: methodObj numInitialNils: blockStart numInitialNils) through: blockStart startpc + blockStart span - 1) < 0 ifTrue: [^result]. "If the final simStackPtr is less than the initial simStackPtr then scanBlock: over- estimated the number of initial nils (because it assumed one or more pushNils to produce an operand were pushNils to initialize temps. This is very rare, so compensate by checking, adjusting numInitialNils and recompiling the block body. N.B. No need to reinitialize the literalsManager because it answers existing literals." initialStackPtr = simStackPtr] whileFalse: [self assert: initialStackPtr > simStackPtr. + blockPass := blockPass + 1. "for asserts :-(" blockStart numInitialNils: blockStart numInitialNils + simStackPtr - initialStackPtr. blockStart fakeHeader dependent: nil. self reinitializeFixupsFrom: blockStart startpc + blockStart numInitialNils through: blockStart startpc + blockStart span - 1. self cCode: 'bzero(abstractOpcodes + initialOpcodeIndex, (opcodeIndex - initialOpcodeIndex) * sizeof(AbstractInstruction))' inSmalltalk: [initialOpcodeIndex to: opcodeIndex - 1 do: [:i| abstractOpcodes at: i put: (CogCompilerClass for: self)]]. opcodeIndex := initialOpcodeIndex. self maybeSetCounterIndex: initialCounterIndex. "For SistaCogit" literalsManager resetForBlockCompile. NewspeakVM ifTrue: [indexOfIRC := initialIndexOfIRC]]. compiledBlocksCount := compiledBlocksCount + 1]. needsFrame := savedNeedsFrame. methodOrBlockNumArgs := savedNumArgs. methodOrBlockNumTemps := savedNumTemps. ^0! Item was added: + ----- Method: StackToRegisterMappingCogit>>maybeCompilingFirstPassOfBlockWithInitialPushNil (in category 'debugging') ----- + maybeCompilingFirstPassOfBlockWithInitialPushNil + "For assert checking; or rather for avoiding assert fails when dealing with the hack for block temps in the SqueakV3PlusClosures bytecode set." + ^inBlock = InVanillaBlock and: [methodOrBlockNumTemps > methodOrBlockNumArgs and: [blockPass = 1]]! Item was changed: ----- Method: StackToRegisterMappingCogit>>ssFlushTo:nativeFlushTo: (in category 'simulation stack') ----- ssFlushTo: index nativeFlushTo: nativeIndex LowcodeVM ifTrue: [self ssNativeFlushTo: nativeIndex]. 0 to: methodOrBlockNumTemps - 1 do: + [:i| self assert: ((self simStackAt: i) type = SSBaseOffset + or: [self maybeCompilingFirstPassOfBlockWithInitialPushNil])]. - [:i| self assert: (self simStackAt: i) type = SSBaseOffset]. methodOrBlockNumTemps to: simSpillBase - 1 do: [:i| self assert: (self simStackAt: i) spilled]. simSpillBase <= index ifTrue: [(simSpillBase max: methodOrBlockNumTemps) to: index do: [:i| self assert: needsFrame. (self simStackAt: i) ensureSpilledAt: (self frameOffsetOfTemporary: i) from: FPReg]. simSpillBase := index + 1]! Item was changed: ----- Method: StackToRegisterMappingCogit>>ssPop: (in category 'simulation stack') ----- ssPop: n self assert: (simStackPtr - n >= (methodOrBlockNumTemps - 1) + or: [(needsFrame not and: [simStackPtr - n >= -1]) + or: [self maybeCompilingFirstPassOfBlockWithInitialPushNil]]). - or: [needsFrame not and: [simStackPtr - n >= -1]]). simStackPtr := simStackPtr - n!

1 0

Re: [Vm-dev] Snowglobe and Tether (was "WebAssembly" on vm-dev)
by Craig Latta 10 Dec '16

10 Dec '16

(Followups to squeak-dev, please.) Hi all-- Ben writes: > It would be amazing to run Cog in a web browser, and thus facilitate > all our favourite Smalltalk dialects. Until WebAssembly has the stack introspection that Clément mentioned, I think the in-browser remote display of Snowglobe[1] would be a good alternative. Even after that, there are good use cases, just like there are uses for VNC, etc. Snowglobe does that sort of screen-sharing in a more convenient way ("just visit a webpage"), and supports distributed computation. The user could approve a JavaScript bridge between the remote app and their web browser, in addition to traditional remote Smalltalk messaging. Even just having a web browser as a launcher for local Cog systems is useful (similar to the launchers of Parallels, VMWare, Kitematic for Docker, EC2, Cloud9, etc. etc.), and it can be a convenient UI medium too. > Side thought: Craig's work to incrementally download a running image > could be useful to reducing web page startup time. Ooh, I'm not sure I did what you think I did... Tell me more about that feature! :) So far there's still a point where an entire snapshot has to transmit, but you can keep using the app remotely in the meantime. In many scenarios you just don't notice the download and subsequent switch to local native Squeak. > Hard to find info on Snowglobe. Only 4 million results to compete > with. When I add "smalltalk" or "squeak", I get [1] within the first five hits on Google and DuckDuckGo ("snowglobe smalltalk" is first on Google). Is that good enough? Speaking of Squeak, Snowglobe isn't limited to that. It just needs WebSockets support, which is in all the Smalltalks and web browsers now. > I tried the demo. http://blackpagedigital.com/snowglobe > Pretty impressive. Thanks! > The world menu is a bit sluggish for a few seconds to pop up each > time... Hm, I just played with it from Europe and it seemed fine. (There are two Snowglobe app servers at the moment, in California and Germany. Amazon's DNS chooses the one with the least latency for you.) I had to restart the California server. What's your region? Like all app streaming systems, performance is sensitive to end-to-end network latency. For some lag-intolerant things, like displaying the normal mouse cursor as you move it around, the local SqueakJS takes over. It looks like I should do the initial display of some of the menus similarly. > ...but menu item highlighting is instantaneous, as is editing in the > system Browser. However mouse point is off by about 15mm at 7o'clock > position. Platform is 32-bit Linux Chrome Version > 48.0.2564.116. (I guess any further discussion on this would be > better on squeak-dev) Ah, that bug's new to me. Yes, let's move discussion of that to squeak-dev. For direct contact I'm on the Squeak Slack channels[2], Twitter (@ccrraaiigg), Skype, etc. etc. I think Slack would be best for getting a live group chat going. > ...reading about "live serialization" the term "serialivation" pops > in mind. Hm, that could lead to libation or Live Nation, or even Disassociated Press[3]. (Search engines are going to love this message.) Phil writes: > Snowglobe is nice indeed. But still slow on this monster of a machine > of mine. Hm, I suspect either the local SqueakJS didn't actually connect to an app server, and you were just observing local SqueakJS UI performance, or there was severe network latency somewhere between you and the servers. I'd be happy to look at it with you. > There is also this: http://blackpagedigital.com/tether > > UI page appears dead though. Oops, some stale links under the hood on that page. Anyway, that demo is superceded by the content at [4], which is what you get when you visit /tether now, too. Thanks for checking it out! -C [1] https://thiscontext.com/2016/10/31/app-streaming-with-snowglobe [2] http://squeak.slack.com [3] https://en.wikipedia.org/wiki/Dissociated_press [4] http://blackpagedigital.com/squeak -- Craig Latta Black Page Digital Amsterdam | San Francisco craig(a)blackpagedigital.com +31 6 2757 7177 (SMS ok) + 1 415 287 3547 (no SMS)

1 0

VM Maker: VMMaker.oscog-eem.2029.mcz
by commits＠source.squeak.org 10 Dec '16

10 Dec '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.2029.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.2029 Author: eem Time: 7 December 2016, 3:03:48.468304 pm UUID: dced5a65-92cd-44de-9d84-41bb46cb09a7 Ancestors: VMMaker.oscog-eem.2028 Fix occasional start-up crashes on linux x64. The choice of 16rBADA550 for a constant in closed PIC prototype generation (used to compute offsets in PICs) occasionally coincides with the address for code chosen by address space randomization, and so confuses the Cogit into generating pc-relative addressing to create this address, hence causing mayhem later on when the wrong sizes for instructions are used to decode closed PIC contents. Hence also beef up the asserts regarding distinguishing constants planted in code on X64 for MoveCwR PushCw and ArithCwR. Implement the Cogit side of mustBeBoolean processing in the RegisterAllocatingCogit. Add a variable to help debug the crashes in callbacks experienced in the Pharo VM. The variable is a set of bit flags tracing the path through returnAs:ThroughCallback:Context:. Fix a compilation warning with the definition of sigsetjump & siglongjmp in the interpreter. =============== Diff against VMMaker.oscog-eem.2028 =============== Item was removed: - ----- Method: CoInterpreter>>ceSendMustBeBooleanInterpreting: (in category 'trampolines') ----- - ceSendMustBeBooleanInterpreting: anObject - "For RegisterAllocatingCogit we want the address following a conditional branch not to be reachable, so we - don't have to generate code to reload registers. Instead simply convert to an interpreter frame." - <api> - self shouldBeImplemented. - instructionPointer := self popStack. - self push: anObject. - self push: instructionPointer. - ^self - ceSendAbort: (objectMemory splObj: SelectorMustBeBoolean) - to: anObject - numArgs: 0! Item was added: + ----- Method: CoInterpreter>>ceSendMustBeBooleanTo:interpretingAtDelta: (in category 'trampolines') ----- + ceSendMustBeBooleanTo: anObject interpretingAtDelta: jumpSize + "For RegisterAllocatingCogit we want the address following a conditional branch not to be reachable, so we + don't have to generate code to reload registers. Instead simply convert to an interpreter frame." + <api> + self flag: 'A nice way to implement this is to + - provide an additional argument that is the size of the branch (have trampolines for 1 & 2 byte jumps). + Note that there is no need to back up before any extensions since the branch will not be taken. + ceSendMustBeBooleanTo: anObject interpretingAtDelta: jumpSize + - map the frame to an interpreter frame + - push anObject + - back up the pc to position the interpreter at the jump + - enter the interpreter, hence reexecuting the mustBeBoolean'. + self shouldBeImplemented. + instructionPointer := self popStack. + self push: anObject. + self push: instructionPointer. + ^self + ceSendAbort: (objectMemory splObj: SelectorMustBeBoolean) + to: anObject + numArgs: 0! Item was changed: ----- Method: CogInLineLiteralsX64Compiler>>concretizeArithCwR: (in category 'generate machine code') ----- concretizeArithCwR: x64opcode | value reg reverse | value := operands at: 0. reg := operands at: 1. reverse := x64opcode = 16r85 or: [x64opcode = 16r39]. "Tst & Cmp; backwards" machineCode at: 0 put: (self rexR: RISCTempReg x: 0 b: RISCTempReg); at: 1 put: 16rB8 + (RISCTempReg bitAnd: 7); at: 2 put: (value bitAnd: 16rFF); at: 3 put: (value >> 8 bitAnd: 16rFF); at: 4 put: (value >> 16 bitAnd: 16rFF); at: 5 put: (value >> 24 bitAnd: 16rFF); at: 6 put: (value >> 32 bitAnd: 16rFF); at: 7 put: (value >> 40 bitAnd: 16rFF); at: 8 put: (value >> 48 bitAnd: 16rFF); at: 9 put: (value >> 56 bitAnd: 16rFF); at: 10 put: (reverse ifTrue: [self rexR: RISCTempReg x: 0 b: reg] ifFalse: [self rexR: reg x: 0 b: RISCTempReg]); at: 11 put: x64opcode; at: 12 put: (reverse ifTrue: [self mod: ModReg RM: reg RO: RISCTempReg] ifFalse: [self mod: ModReg RM: RISCTempReg RO: reg]). + self assert: (machineCode at: 12) > 16r90. "See literalBeforeFollowingAddress:" ^machineCodeSize := 13! Item was changed: ----- Method: CogInLineLiteralsX64Compiler>>concretizeMoveCwR (in category 'generate machine code') ----- concretizeMoveCwR "Will get inlined into concretizeAt: switch." <inline: true> | value reg offset | value := operands at: 0. reg := operands at: 1. (self isAnInstruction: (cogit cCoerceSimple: value to: #'AbstractInstruction *')) ifTrue: [value := (cogit cCoerceSimple: value to: #'AbstractInstruction *') address]. (cogit addressIsInCurrentCompilation: value) ifTrue: [offset := value - (address + 7). machineCode at: 0 put: (self rexR: reg x: 0 b: 0); at: 1 put: 16r8D; "LoadEffectiveAddress" at: 2 put: (self mod: ModRegInd RM: 5 RO: reg); at: 3 put: (offset bitAnd: 16rFF); at: 4 put: (offset >> 8 bitAnd: 16rFF); at: 5 put: (offset >> 16 bitAnd: 16rFF); at: 6 put: (offset >> 24 bitAnd: 16rFF). ^machineCodeSize := 7]. machineCode at: 0 put: (self rexR: 0 x: 0 b: reg); at: 1 put: 16rB8 + (reg bitAnd: 7); at: 2 put: (value bitAnd: 16rFF); at: 3 put: (value >> 8 bitAnd: 16rFF); at: 4 put: (value >> 16 bitAnd: 16rFF); at: 5 put: (value >> 24 bitAnd: 16rFF); at: 6 put: (value >> 32 bitAnd: 16rFF); at: 7 put: (value >> 40 bitAnd: 16rFF); at: 8 put: (value >> 48 bitAnd: 16rFF); at: 9 put: (value >> 56 bitAnd: 16rFF). + "Add a nop to disambiguate between MoveCwR/PushCw and ArithCwR, which ends with a (self mod: ModReg RM: 0 RO: 0)" - opcode = MoveCqR ifTrue: - [^machineCodeSize := 10]. - "Add a nop to disambiguate between MoveCwR/PushCwR and ArithCwR, which ends with a (self mod: ModReg RM: 0 RO: 0)" machineCode at: 10 put: 16r90. - self assert: (self mod: ModReg RM: 0 RO: 0) > 16r90. ^machineCodeSize := 11! Item was changed: ----- Method: CogInLineLiteralsX64Compiler>>concretizePushCw (in category 'generate machine code') ----- concretizePushCw "Will get inlined into concretizeAt: switch." <inline: true> | value offset | value := operands at: 0. (self isAnInstruction: (cogit cCoerceSimple: value to: #'AbstractInstruction *')) ifTrue: [value := (cogit cCoerceSimple: value to: #'AbstractInstruction *') address]. (cogit addressIsInCurrentCompilation: value) ifTrue: [offset := value - (address + 7). machineCode at: 0 put: (self rexR: RISCTempReg x: 0 b: 0); at: 1 put: 16r8D; "LoadEffectiveAddress" at: 2 put: (self mod: ModRegInd RM: 5 RO: RISCTempReg); at: 3 put: (offset bitAnd: 16rFF); at: 4 put: (offset >> 8 bitAnd: 16rFF); at: 5 put: (offset >> 16 bitAnd: 16rFF); at: 6 put: (offset >> 24 bitAnd: 16rFF); at: 7 put: 16r41; at: 8 put: 16r48 + RISCTempReg. ^machineCodeSize := 9]. machineCode at: 0 put: (self rexR: RISCTempReg x: 0 b: RISCTempReg); at: 1 put: 16rB8 + (RISCTempReg bitAnd: 7); at: 2 put: (value bitAnd: 16rFF); at: 3 put: (value >> 8 bitAnd: 16rFF); at: 4 put: (value >> 16 bitAnd: 16rFF); at: 5 put: (value >> 24 bitAnd: 16rFF); at: 6 put: (value >> 32 bitAnd: 16rFF); at: 7 put: (value >> 40 bitAnd: 16rFF); at: 8 put: (value >> 48 bitAnd: 16rFF); at: 9 put: (value >> 56 bitAnd: 16rFF); at: 10 put: 16r41; + at: 11 put: 16r48 + RISCTempReg. "The 48 will disambiguate between MoveCwR, PushCw and ArithCwR, which ends with a (self mod: ModReg RM: 0 RO: 0)" + self assert: (machineCode at: 11) < 16r90. "see literalBeforeFollowingAddress:" - at: 11 put: 16r48 + RISCTempReg. "The 48 will disambiguate between MoveCwR, PushCwR and ArithCwR, which ends with a (self mod: ModReg RM: 0 RO: 0)" - self assert: RISCTempReg >= 8. - self assert: (self mod: ModReg RM: 0 RO: 0) > 16r57. ^machineCodeSize := 12! Item was changed: ----- Method: CogInLineLiteralsX64Compiler>>literalBeforeFollowingAddress: (in category 'inline cacheing') ----- literalBeforeFollowingAddress: followingAddress "Answer the literal embedded in the instruction immediately preceding followingAddress. + This is used in the MoveCwR, PushCw and ArithCwR cases; these are distinguished by a + nop following the literal load in MoveCwR, a 16r48 + reg ending the PushCw sequence, and + a (self mod: ModReg RM: rX RO: rY) ending the ArithCwR sequence, which is at least 16rC0." - This is used in the MoveCwR, PushCwR and CmpCwR cases; these are distinguished by a - nop following the literal load in MoveCwR, a 16r50 + reg ending the PushCwR sequence, and - a (self mod: ModReg RM: rX RO: rY) ending the CmpCwR sequence, which is at least 16rC0." | lastByte base | lastByte := objectMemory byteAt: followingAddress - 1. + base := followingAddress - (lastByte = 16r90 + ifTrue: [9] "MoveCwR" + ifFalse: + [lastByte < 16r90 + ifTrue: [10] "PushCw" + ifFalse: [11]]). "ArithCwR" + ^objectMemory unalignedLongAt: base + + "(Symbol allSymbols select: [:s| '*Cw:R:' match: s]), {#PushCw:} collect: [:s| {s. (self systemNavigation allCallsOn: s localToPackage: #VMMaker) size}]"! - base := followingAddress - (lastByte <= 16r90 - ifTrue: - [lastByte = 16r90 - ifTrue: [9] "MoveCwR" - ifFalse: [10]] "PushCwR" - ifFalse: [11]). "ArithCwR" - ^objectMemory unalignedLongAt: base! Item was changed: ----- Method: CogInLineLiteralsX64Compiler>>storeLiteral:beforeFollowingAddress: (in category 'inline cacheing') ----- storeLiteral: literal beforeFollowingAddress: followingAddress "Rewrite the literal in the instruction immediately preceding followingAddress. + This is used in the MoveCwR, PushCw and CmpCwR cases; these are distinguished by a + nop following the literal load in MoveCwR, a 16r50 + reg ending the PushCw sequence, and - This is used in the MoveCwR, PushCwR and CmpCwR cases; these are distinguished by a - nop following the literal load in MoveCwR, a 16r50 + reg ending the PushCwR sequence, and a (self mod: ModReg RM: rX RO: rY) ending the CmpCwR sequence, which is at least 16rC0." | lastByte base | lastByte := objectMemory byteAt: followingAddress - 1. base := followingAddress - (lastByte <= 16r90 ifTrue: [lastByte = 16r90 ifTrue: [9] "MoveCwR" + ifFalse: [10]] "PushCw" - ifFalse: [10]] "PushCwR" ifFalse: [11]). "ArithCwR" objectMemory unalignedLongAt: base put: literal! Item was changed: ----- Method: CogMIPSELCompiler>>relocateMethodReferenceBeforeAddress:by: (in category 'inline cacheing') ----- relocateMethodReferenceBeforeAddress: pc by: delta | oldValue newValue | "cogit disassembleFrom: pc - 16 to: pc + 16 a StackToRegisterMappingCogit." ((self opcodeAtAddress: pc - 8) = ADDIU and: [(self opcodeAtAddress: pc - 4) = SW]) ifTrue: + ["PushCw" - ["PushCwR" oldValue := self literalAtAddress: pc - 12. newValue := oldValue + delta. self literalAtAddress: pc - 12 put: newValue. self assert: (self literalAtAddress: pc - 12) = newValue. ^self]. "MoveCwR" oldValue := self literalAtAddress: pc - 4. newValue := oldValue + delta. self literalAtAddress: pc - 4 put: newValue. "cogit disassembleFrom: pc - 8 to: pc." self assert: (self literalAtAddress: pc - 4) = newValue. ! Item was changed: ----- Method: CogMIPSELCompiler>>storeLiteral:beforeFollowingAddress: (in category 'inline cacheing') ----- storeLiteral: literal beforeFollowingAddress: followingAddress + "Rewrite the long constant loaded by a MoveCwR or PushCw before the given address" + self flag: #bogus. "The caller ought to know what it is patching, and this should be split into separate methods with stricter checking. rmacnak 12/13/2015" - "Rewrite the long constant loaded by a MoveCwR or PushCwR before the given address" - self flag: #bogus. "The caller ought to know what it is patching, and this should be split into separate methods with stricter checking." "Cmp/MoveCwR pc-8 lui rx, uper pc-4 ori rx, rx, lower" (self opcodeAtAddress: followingAddress - 4) = ORI ifTrue: [^self literalAtAddress: followingAddress - 4 put: literal]. "PushCw pc-16 lui at, upper pc-12 ori at, at, lower pc-8 addiu sp, sp, -4 pc-4 sw at, 0(sp)" ((self opcodeAtAddress: followingAddress - 4) = SW and: [(self opcodeAtAddress: followingAddress - 8) = ADDIU]) ifTrue: [^self literalAtAddress: followingAddress - 12 put: literal]. self unreachable. ^0! Item was changed: ----- Method: CogX64Compiler>>concretizeMoveCqR (in category 'generate machine code') ----- concretizeMoveCqR "Will get inlined into concretizeAt: switch. + On x64 we can short-cut mov 0, reg using xor, and use signed 32-bit displacement, if possible." - On x64 we can short-cut mov 0, reg using xor, and use 32-bit displacement, signed or unsigned, if possible." <inline: true> | value reg | value := operands at: 0. - (self is32BitSignedImmediate: value) ifFalse: - [^self concretizeMoveCwR]. reg := operands at: 1. + (self is32BitSignedImmediate: value) ifTrue: + [value = 0 ifTrue: + [machineCode + at: 0 put: (self rexR: reg x: 0 b: reg); + at: 1 put: 16r31; + at: 2 put: (self mod: ModReg RM: reg RO: reg). + ^machineCodeSize := 3]. + machineCode + at: 0 put: (self rexR: 0 x: 0 b: reg); + at: 1 put: 16rC7; + at: 2 put: (self mod: ModReg RM: reg RO: 0); + at: 3 put: (value bitAnd: 16rFF); + at: 4 put: (value >> 8 bitAnd: 16rFF); + at: 5 put: (value >> 16 bitAnd: 16rFF); + at: 6 put: (value >> 24 bitAnd: 16rFF). + ^machineCodeSize := 7]. + - value = 0 ifTrue: - [machineCode - at: 0 put: (self rexR: reg x: 0 b: reg); - at: 1 put: 16r31; - at: 2 put: (self mod: ModReg RM: reg RO: reg). - ^machineCodeSize := 3]. machineCode + at: 0 put: (self rexR: 0 x: 0 b: reg); + at: 1 put: 16rB8 + (reg bitAnd: 7); + at: 2 put: (value bitAnd: 16rFF); + at: 3 put: (value >> 8 bitAnd: 16rFF); + at: 4 put: (value >> 16 bitAnd: 16rFF); + at: 5 put: (value >> 24 bitAnd: 16rFF); + at: 6 put: (value >> 32 bitAnd: 16rFF); + at: 7 put: (value >> 40 bitAnd: 16rFF); + at: 8 put: (value >> 48 bitAnd: 16rFF); + at: 9 put: (value >> 56 bitAnd: 16rFF). + ^machineCodeSize := 10! - at: 0 put: (self rexR: 0 x: 0 b: reg); - at: 1 put: 16rC7; - at: 2 put: (self mod: ModReg RM: reg RO: 0); - at: 3 put: (value bitAnd: 16rFF); - at: 4 put: (value >> 8 bitAnd: 16rFF); - at: 5 put: (value >> 16 bitAnd: 16rFF); - at: 6 put: (value >> 24 bitAnd: 16rFF). - ^machineCodeSize := 7! Item was changed: ----- Method: Cogit>>addressIsInCurrentCompilation: (in category 'testing') ----- addressIsInCurrentCompilation: address + <inline: true> ^address asUnsignedInteger >= methodLabel address and: [address asUnsignedInteger < methodZone youngReferrers]! Item was changed: ----- Method: Cogit>>compileClosedPICPrototype (in category 'in-line cacheing') ----- compileClosedPICPrototype "Compile the abstract instructions for a full closed PIC, used to generate the chunk of code which is copied to form each closed PIC. A Closed Polymorphic Inline Cache is a small jump table used to optimize sends with a limited degree of polymorphism (currently up to 6 cases). We call it closed because it deals only with a finite number of cases, as opposed to an Open PIC. When a monomorphic linked send (a send with a single case, linking direct to the checked entry point of a CogMethod) fails a class check, the Cogit attempts to create a two-entry PIC that will handle jumping to the original target for the original class and the relevant target for the new class. This jump table will be extended on subsequent failures up to a limit (6). We avoid extending CPICs to Open PICs by linking the send site to an Open PIC if one already exists with the send's selector, a good policy since measurements show that sends of mega- morphic selectors usually become megamorphic at all send sites. Hence the Open PIC list. A CPIC also optimizes MNUs and interpret-only methods. Each case can load SendNumArgs with the oop of a method, or will load SendNumArgs with 0 if not. MNUs are optimized by jumping to the mnuAbort in the CPIC, which calls code that creates the Message, thereby avoiding looking up the original message which will not be found, and either looks up doesNotUnderstand: or directly activates the method loaded into SendNumArgs, hence avoiding looking up doesNotUnderstand:. Interpret-only methods are handled by jumping to the picInterpretAbort, which enters the interpreter activating the method loaded in SendNumArgs. CPICs look like the following, where rClass is set at the original send site for the 1st case, and #Foo is some constant, either an oop, a class tag or an instruction address. rTemp := (rRecever bitAnd: TagMask) = 0 ifTrue: [rReceiver class] ifFalse: [rRecever bitAnd: TagMask]. rTemp = rClass ifFalse: [self goto: #Label]. rSendNumArgs := #MethodForCase1Or0. self goto: #TargetForCase1. #Label rTemp = #ClassTagForCase6 ifTrue: [rSendNumArgs := #MethodForCase6Or0. self goto: #TargetForCase6]. ...cases 5, 4 & 3 rTemp = #ClassTagForCase2 ifTrue: [rSendNumArgs := #MethodForCase2Or0. self goto: #TargetForCase2]. self goto: #CPICMissTrampoline literals (if out-of-line literals) where we short-cut as many cases as needed by making the self goto: #Label skip as many cases as needed." <inline: true> | numArgs jumpNext | <var: #jumpNext type: #'AbstractInstruction *'> self compilePICAbort: (numArgs := 0). "Will get rewritten to appropriate arity when configuring." jumpNext := self compileCPICEntry. "At the end of the entry code we need to jump to the first case code, which is actually the last chunk. On each entension we must update this jump to move back one case." + self MoveUniqueCw: self firstPrototypeMethodOop R: SendNumArgsReg. - "16r5EAF00D is the method oop, or 0, for the 1st case." - self MoveUniqueCw: 16r5EAF00D R: SendNumArgsReg. self JumpLong: self cPICPrototypeCaseOffset + 16rCA5E10. endCPICCase0 := self Label. 1 to: MaxCPICCases - 1 do: [:h| h = (MaxCPICCases - 1) ifTrue: [jumpNext jmpTarget: self Label]. "this is where we jump to for the first case" + self MoveUniqueCw: self subsequentPrototypeMethodOop + h R: SendNumArgsReg. - "16rBADA550+h is the method oop, or 0, for the Nth case." - self MoveUniqueCw: 16rBADA550 + h R: SendNumArgsReg. "16rBABE1F15+h is the class tag for the Nth case" self CmpC32: 16rBABE1F15+h R: TempReg. self JumpLongZero: self cPICPrototypeCaseOffset + 16rCA5E10 + (h * 16). h = 1 ifTrue: [endCPICCase1 := self Label]]. self MoveCw: methodLabel address R: ClassReg. self JumpLong: (self cPICMissTrampolineFor: numArgs). "Will get rewritten to appropriate arity when configuring." cPICEndOfCodeLabel := self Label. literalsManager dumpLiterals: false. ^0! Item was changed: ----- Method: Cogit>>expectedClosedPICPrototype: (in category 'in-line cacheing') ----- expectedClosedPICPrototype: cPIC "Use asserts to check if the ClosedPICPrototype is as expected from compileClosedPICPrototype, and can be updated as required via rewriteCPICCaseAt:tag:objRef:target:. If all asserts pass, answer 0, otherwise answer a bit mask identifying all the errors." "self disassembleFrom: methodZoneBase + (self sizeof: CogMethod) to: methodZoneBase + closedPICSize" <var: #cPIC type: #'CogMethod *'> | pc errors object classTag entryPoint | errors := 0. pc := cPIC asUnsignedInteger + firstCPICCaseOffset. "First jump is unconditional; subsequent ones are conditional" object := backEnd literalBeforeFollowingAddress: pc - backEnd jumpLongByteSize. + (self asserta: object = self firstPrototypeMethodOop) ifFalse: - (self asserta: object = 16r5EAF00D) ifFalse: [errors := 1]. entryPoint := backEnd jumpLongTargetBeforeFollowingAddress: pc. (self asserta: entryPoint = (self cPICPrototypeCaseOffset + 16rCA5E10)) ifFalse: [errors := errors + 2]. 1 to: MaxCPICCases - 1 do: [:i | | methodObjPC classTagPC | pc := pc + cPICCaseSize. "verify information in case is as expected." methodObjPC := pc - backEnd jumpLongConditionalByteSize - backEnd cmpC32RTempByteSize. object := backEnd literalBeforeFollowingAddress: methodObjPC. + (self asserta: object = (self subsequentPrototypeMethodOop+ i)) ifFalse: - (self asserta: object = (16rBADA550 + i)) ifFalse: [errors := errors bitOr: 4]. classTagPC := pc - backEnd jumpLongConditionalByteSize. classTag := backEnd literal32BeforeFollowingAddress: classTagPC. (self asserta: classTag = (16rBABE1F15 + i)) ifFalse: [errors := errors bitOr: 8]. entryPoint := backEnd jumpLongConditionalTargetBeforeFollowingAddress: pc. (self asserta: entryPoint = (self cPICPrototypeCaseOffset + 16rCA5E10 + (i * 16))) ifFalse: [errors := errors bitOr: 16]. "change case via rewriteCPICCaseAt:tag:objRef:target:" self rewriteCPICCaseAt: pc tag: (classTag bitXor: 16r5A5A5A5A) objRef: (object bitXor: 16rA5A5A5A5) target: (entryPoint bitXor: 16r55AA50). "don't xor least 4 bits to leave instruction alignment undisturbed" "verify information in case is as expected post update." object := backEnd literalBeforeFollowingAddress: methodObjPC. + (self asserta: object = (self subsequentPrototypeMethodOop + i bitXor: 16rA5A5A5A5)) ifFalse: - (self asserta: object = (16rBADA550 + i bitXor: 16rA5A5A5A5)) ifFalse: [errors := errors bitOr: 32]. classTag := backEnd literal32BeforeFollowingAddress: classTagPC. (self asserta: classTag = (16rBABE1F15 + i bitXor: 16r5A5A5A5A)) ifFalse: [errors := errors bitOr: 64]. entryPoint := backEnd jumpLongConditionalTargetBeforeFollowingAddress: pc. (self asserta: entryPoint = ((self cPICPrototypeCaseOffset + 16rCA5E10 + (i * 16)) bitXor: 16r55AA50)) ifFalse: [errors := errors bitOr: 128]. "finally restore case to the original state" self rewriteCPICCaseAt: pc tag: (classTag bitXor: 16r5A5A5A5A) objRef: (object bitXor: 16rA5A5A5A5) target: (entryPoint bitXor: 16r55AA50)]. entryPoint := backEnd jumpLongTargetBeforeFollowingAddress: pc + cPICEndSize - literalsManager endSizeOffset. (self asserta: entryPoint = (self cPICMissTrampolineFor: 0)) ifFalse: [errors := errors + 256]. ^errors! Item was added: + ----- Method: Cogit>>firstPrototypeMethodOop (in category 'in-line cacheing') ----- + firstPrototypeMethodOop + "Answer a fake value for the first method oop in the PIC prototype. + Since we use MoveUniqueCw:R: it must not be confused with a method-relative address." + <inline: false> + ^(self addressIsInCurrentCompilation: 16r5EAF00D) + ifTrue: [16rCA7F00D] + ifFalse: [16r5EAF00D]! Item was added: + ----- Method: Cogit>>genCallMustBeBooleanFor: (in category 'trampoline support') ----- + genCallMustBeBooleanFor: boolean + ^self CallRT: (boolean = objectMemory falseObject + ifTrue: [ceSendMustBeBooleanAddFalseTrampoline] + ifFalse: [ceSendMustBeBooleanAddTrueTrampoline])! Item was added: + ----- Method: Cogit>>subsequentPrototypeMethodOop (in category 'in-line cacheing') ----- + subsequentPrototypeMethodOop + "Answer a fake value for the method oop in other than the first case in the PIC prototype. + Since we use MoveUniqueCw:R: it must not be confused with a method-relative address." + <inline: false> + ^(self addressIsInCurrentCompilation: 16rBADA550) + ifTrue: [16rDEADEAD] + ifFalse: [16rBADA550]! Item was changed: StackToRegisterMappingCogit subclass: #RegisterAllocatingCogit + instanceVariableNames: 'numFixups mergeSimStacksBase nextFixup scratchSimStack scratchSpillBase scratchOptStatus ceSendMustBeBooleanAddTrueLongTrampoline ceSendMustBeBooleanAddFalseLongTrampoline' - instanceVariableNames: 'numFixups mergeSimStacksBase nextFixup scratchSimStack scratchSpillBase scratchOptStatus' classVariableNames: '' poolDictionaries: '' category: 'VMMaker-JIT'! !RegisterAllocatingCogit commentStamp: 'cb 4/15/2016 14:58' prior: 0! RegisterAllocatingCogit is an optimizing code generator that is specialized in register allocation.. On the contrary to StackToRegisterMappingCogit, RegisterAllocatingCogit keeps at each control flow merge point the state of the simulated stack to merge into and not only an integer fixup. Each branch and jump record the current state of the simulated stack, and each fixup is responsible for merging this state into the saved simulated stack. ! Item was added: + ----- Method: RegisterAllocatingCogit class>>numTrampolines (in category 'accessing') ----- + numTrampolines + ^super numTrampolines + 2 "includes long sendMustBeBoolean trampolines" + + "Cogit withAllSubclasses, CogObjectRepresentation withAllSubclasses collect: + [:c| {c. (c instVarNames select: [:ea| ea beginsWith: 'ce']) size}]" + "self allInstVarNames select: [:ea| ea beginsWith: 'ce']" + "self instVarNames select: [:ea| ea beginsWith: 'ce']"! Item was added: + ----- Method: RegisterAllocatingCogit>>genCallMustBeBooleanFor: (in category 'trampoline support') ----- + genCallMustBeBooleanFor: boolean + self assert: ((self generatorAt: byte0) numBytes between: 1 and: 2). + ^self CallRT: ((self generatorAt: byte0) numBytes = 1 + ifTrue: + [boolean = objectMemory falseObject + ifTrue: [ceSendMustBeBooleanAddFalseTrampoline] + ifFalse: [ceSendMustBeBooleanAddTrueTrampoline]] + ifFalse: + [boolean = objectMemory falseObject + ifTrue: [ceSendMustBeBooleanAddFalseLongTrampoline] + ifFalse: [ceSendMustBeBooleanAddTrueLongTrampoline]])! Item was changed: ----- Method: RegisterAllocatingCogit>>genJumpIf:to: (in category 'bytecode generator support') ----- genJumpIf: boolean to: targetBytecodePC <inline: false> | desc reg fixup ok | <var: #desc type: #'CogSimStackEntry *'> <var: #fixup type: #'BytecodeFixup *'> <var: #ok type: #'AbstractInstruction *'> desc := self ssTop. self ssPop: 1. (desc type == SSConstant and: [desc constant = objectMemory trueObject or: [desc constant = objectMemory falseObject]]) ifTrue: ["Must arrange there's a fixup at the target whether it is jumped to or not so that the simStackPtr can be kept correct." fixup := self ensureFixupAt: targetBytecodePC - initialPC. "Must annotate the bytecode for correct pc mapping." self annotateBytecode: (desc constant = boolean ifTrue: [self Jump: fixup] ifFalse: [self prevInstIsPCAnnotated ifTrue: [self Nop] ifFalse: [self Label]]). extA := 0. ^0]. "try and use the top entry's register if anty, but only if it can be destroyed." reg := (desc type ~= SSRegister or: [(self anyReferencesToRegister: desc register inAllButTopNItems: 0) or: [(desc register = ReceiverResultReg and: [optStatus isReceiverResultRegLive])]]) ifTrue: [TempReg] ifFalse: [desc register]. desc popToReg: reg. "Cunning trick by LPD. If true and false are contiguous subtract the smaller. Correct result is either 0 or the distance between them. If result is not 0 or their distance send mustBeBoolean." self assert: (objectMemory objectAfter: objectMemory falseObject) = objectMemory trueObject. self genSubConstant: boolean R: reg. self JumpZero: (self ensureFixupAt: targetBytecodePC - initialPC). self extASpecifiesNoMustBeBoolean ifTrue: [extA := 0. self annotateBytecode: self lastOpcode. ^0]. extA := 0. . self CmpCq: (boolean = objectMemory falseObject ifTrue: [objectMemory trueObject - objectMemory falseObject] ifFalse: [objectMemory falseObject - objectMemory trueObject]) R: reg. ok := self JumpZero: 0. reg ~= TempReg ifTrue: [self MoveR: reg R: TempReg]. self copySimStackToScratch: simSpillBase. self ssFlushTo: simStackPtr. + self genCallMustBeBooleanFor: boolean. - self CallRT: (boolean = objectMemory falseObject - ifTrue: [ceSendMustBeBooleanAddFalseTrampoline] - ifFalse: [ceSendMustBeBooleanAddTrueTrampoline]). "NOTREACHED" ok jmpTarget: (self annotateBytecode: self Label). self restoreSimStackFromScratch. ^0! Item was added: + ----- Method: RegisterAllocatingCogit>>genMustBeBooleanLongTrampolineFor:called: (in category 'initialization') ----- + genMustBeBooleanLongTrampolineFor: boolean called: trampolineName + <inline: true> + ^self genMustBeBooleanTrampolineFor: boolean branchBytes: 2 called: trampolineName! Item was added: + ----- Method: RegisterAllocatingCogit>>genMustBeBooleanTrampolineFor:branchBytes:called: (in category 'initialization') ----- + genMustBeBooleanTrampolineFor: boolean branchBytes: branchBytes called: trampolineName + <var: #trampolineName type: #'char *'> + "For RegisterAllocatingCogit we want the address following a conditional branch not to be reachable, so we + don't have to generate code to reload registers. Instead simply convert to an interpreter frame." + <inline: false> + self zeroOpcodeIndex. + "If the objectRepresentation does want true & false to be mobile then we need to record these addresses." + self assert: (objectRepresentation shouldAnnotateObjectReference: boolean) not. + self AddCq: boolean R: TempReg. + ^self genTrampolineFor: #ceSendMustBeBooleanTo:interpretingAtDelta: + called: trampolineName + numArgs: 2 + arg: TempReg + arg: (self trampolineArgConstant: branchBytes) + arg: nil + arg: nil + regsToSave: self emptyRegisterMask + pushLinkReg: true + resultReg: NoReg + appendOpcodes: true! Item was changed: ----- Method: RegisterAllocatingCogit>>genMustBeBooleanTrampolineFor:called: (in category 'initialization') ----- genMustBeBooleanTrampolineFor: boolean called: trampolineName + <inline: true> + ^self genMustBeBooleanTrampolineFor: boolean branchBytes: 1 called: trampolineName! - <var: #trampolineName type: #'char *'> - "For RegisterAllocatingCogit we want the address following a conditional branch not to be reachable, so we - don't have to generate code to reload registers. Instead simply convert to an interpreter frame." - <inline: false> - self zeroOpcodeIndex. - "If the objectRepresentation does want true & false to be mobile then we need to record these addresses." - self assert: (objectRepresentation shouldAnnotateObjectReference: boolean) not. - self AddCq: boolean R: TempReg. - ^self genTrampolineFor: #ceSendMustBeBooleanInterpreting: - called: trampolineName - numArgs: 1 - arg: TempReg - arg: nil - arg: nil - arg: nil - regsToSave: self emptyRegisterMask - pushLinkReg: true - resultReg: NoReg - appendOpcodes: true! Item was added: + ----- Method: RegisterAllocatingCogit>>generateRunTimeTrampolines (in category 'initialization') ----- + generateRunTimeTrampolines + "Generate the run-time entries at the base of the native code zone and update the base." + + ceSendMustBeBooleanAddFalseLongTrampoline := self genMustBeBooleanLongTrampolineFor: objectMemory falseObject + called: 'ceSendMustBeBooleanAddFalseTrampoline'. + ceSendMustBeBooleanAddTrueLongTrampoline := self genMustBeBooleanLongTrampolineFor: objectMemory trueObject + called: 'ceSendMustBeBooleanAddTrueTrampoline'. + super generateRunTimeTrampolines! Item was changed: ----- Method: SimpleStackBasedCogit>>genJumpIf:to: (in category 'bytecode generator support') ----- genJumpIf: boolean to: targetBytecodePC <inline: false> "Cunning trick by LPD. If true and false are contiguous subtract the smaller. Correct result is either 0 or the distance between them. If result is not 0 or their distance send mustBeBoolean." | ok | <var: #ok type: #'AbstractInstruction *'> extA := 0. self assert: (objectMemory objectAfter: objectMemory falseObject) = objectMemory trueObject. self PopR: TempReg. self genSubConstant: boolean R: TempReg. self JumpZero: (self ensureFixupAt: targetBytecodePC - initialPC). self CmpCq: (boolean == objectMemory falseObject ifTrue: [objectMemory trueObject - objectMemory falseObject] ifFalse: [objectMemory falseObject - objectMemory trueObject]) R: TempReg. ok := self JumpZero: 0. + self genCallMustBeBooleanFor: boolean. - self CallRT: (boolean = objectMemory falseObject - ifTrue: [ceSendMustBeBooleanAddFalseTrampoline] - ifFalse: [ceSendMustBeBooleanAddTrueTrampoline]). ok jmpTarget: (self annotateBytecode: self Label). ^0! Item was changed: ----- Method: SistaCogit>>genJumpIf:to: (in category 'bytecode generator support') ----- genJumpIf: boolean to: targetBytecodePC "The heart of performance counting in Sista. Conditional branches are 6 times less frequent than sends and can provide basic block frequencies (send counters can't). Each conditional has a 32-bit counter split into an upper 16 bits counting executions and a lower half counting untaken executions of the branch. Executing the branch decrements the upper half, tripping if the count goes negative. Not taking the branch decrements the lower half. N.B. We *do not* eliminate dead branches (true ifTrue:/true ifFalse:) so that scanning for send and branch data is simplified and that branch data is correct." <inline: false> | ok counterAddress countTripped retry nextPC nextDescriptor desc | <var: #ok type: #'AbstractInstruction *'> <var: #desc type: #'CogSimStackEntry *'> <var: #retry type: #'AbstractInstruction *'> <var: #countTripped type: #'AbstractInstruction *'> <var: #nextDescriptor type: #'BytecodeDescriptor *'> "In optimized code we don't generate counters to improve performance" (coInterpreter isOptimizedMethod: methodObj) ifTrue: [ ^ super genJumpIf: boolean to: targetBytecodePC ]. "If the branch is reached only for the counter trip trampoline (typically, var1 == var2 ifTrue: falls through to the branch only for the trampoline) we generate a specific path to drastically reduce the number of machine instructions" branchReachedOnlyForCounterTrip ifTrue: [ branchReachedOnlyForCounterTrip := false. ^ self genCounterTripOnlyJumpIf: boolean to: targetBytecodePC ]. "We detect and: / or:, if found, we don't generate the counters to avoid pathological counter slow down" boolean == objectMemory falseObject ifTrue: [ nextPC := bytecodePC + (self generatorAt: byte0) numBytes. nextDescriptor := self generatorAt: (objectMemory fetchByte: nextPC ofObject: methodObj) + bytecodeSetOffset. nextDescriptor generator == #genPushConstantTrueBytecode ifTrue: [ ^ super genJumpIf: boolean to: targetBytecodePC ]. nextDescriptor := self generatorAt: (objectMemory fetchByte: targetBytecodePC ofObject: methodObj) + bytecodeSetOffset. nextDescriptor generator == #genPushConstantFalseBytecode ifTrue: [ ^ super genJumpIf: boolean to: targetBytecodePC ]. ]. extA := 0. "We ignore the noMustBeBoolean flag. It should not be present in methods with counters, and if it is we don't care." "We don't generate counters on branches on true/false, the basicblock usage can be inferred" desc := self ssTop. (desc type == SSConstant and: [desc constant = objectMemory trueObject or: [desc constant = objectMemory falseObject]]) ifTrue: [ ^ super genJumpIf: boolean to: targetBytecodePC ]. self ssFlushTo: simStackPtr - 1. desc popToReg: TempReg. self ssPop: 1. "We need SendNumArgsReg because of the mustBeBooleanTrampoline" self ssAllocateRequiredReg: SendNumArgsReg. retry := self Label. self genExecutionCountLogicInto: [ :cAddress :countTripBranch | counterAddress := cAddress. countTripped := countTripBranch ] counterReg: SendNumArgsReg. counterIndex := counterIndex + 1. "Cunning trick by LPD. If true and false are contiguous subtract the smaller. Correct result is either 0 or the distance between them. If result is not 0 or their distance send mustBeBoolean." self assert: (objectMemory objectAfter: objectMemory falseObject) = objectMemory trueObject. self genSubConstant: boolean R: TempReg. self JumpZero: (self ensureFixupAt: targetBytecodePC - initialPC). self genFallsThroughCountLogicCounterReg: SendNumArgsReg counterAddress: counterAddress. self CmpCq: (boolean == objectMemory falseObject ifTrue: [objectMemory trueObject - objectMemory falseObject] ifFalse: [objectMemory falseObject - objectMemory trueObject]) R: TempReg. ok := self JumpZero: 0. self MoveCq: 0 R: SendNumArgsReg. "if counterReg is 0 this is a mustBeBoolean, not a counter trip." + countTripped jmpTarget: (self genCallMustBeBooleanFor: boolean). - countTripped jmpTarget: - (self CallRT: (boolean == objectMemory falseObject - ifTrue: [ceSendMustBeBooleanAddFalseTrampoline] - ifFalse: [ceSendMustBeBooleanAddTrueTrampoline])). "If we're in an image which hasn't got the Sista code loaded then the ceCounterTripped: trampoline will return directly to machine code, returning the boolean. So the code should jump back to the retry point. The trampoline makes sure that TempReg has been reloaded." self annotateBytecode: self Label. "For some reason if I write self annotateBytecode: (self Jump: retry) the annotation is not at the correct place." self Jump: retry. ok jmpTarget: self Label. ^0! Item was changed: InterpreterPrimitives subclass: #StackInterpreter + instanceVariableNames: 'currentBytecode bytecodeSetSelector localFP localIP localSP stackLimit stackPage stackPages method instructionPointer stackPointer framePointer localReturnValue localAbsentReceiver localAbsentReceiverOrZero extA extB primitiveFunctionPointer methodCache nsMethodCache atCache lkupClassTag lkupClass methodDictLinearSearchLimit highestRunnableProcessPriority nextWakeupUsecs nextPollUsecs inIOProcessEvents interruptKeycode interruptPending savedWindowSize imageHeaderFlags fullScreenFlag deferDisplayUpdates pendingFinalizationSignals extraVMMemory interpreterProxy showSurfaceFn primitiveTable primitiveAccessorDepthTable externalPrimitiveTable externalPrimitiveTableFirstFreeIndex overflowedPage extraFramesToMoveOnOverflow globalSessionID jmpBuf jmpDepth suspendedCallbacks suspendedMethods numStackPages desiredNumStackPages desiredEdenBytes classNameIndex thisClassIndex metaclassNumSlots interruptCheckChain suppressHeartbeatFlag breakSelector breakSelectorLength l ongRunningPrimitiveCheckMethod longRunningPrimitiveCheckSemaphore longRunningPrimitiveStartUsecs longRunningPrimitiveStopUsecs longRunningPrimitiveGCUsecs longRunningPrimitiveCheckSequenceNumber longRunningPrimitiveSignalUndelivered checkAllocFiller tempOop tempOop2 tempOop3 theUnknownShort the2ndUnknownShort imageFloatsBigEndian maxExtSemTabSizeSet lastMethodCacheProbeWrite gcSemaphoreIndex classByteArrayCompactIndex checkedPluginName statForceInterruptCheck statStackOverflow statStackPageDivorce statCheckForEvents statProcessSwitch statIOProcessEvents statPendingFinalizationSignals nativeSP nativeStackPointer lowcodeCalloutState shadowCallStackPointer debugCallbackPath' - instanceVariableNames: 'currentBytecode bytecodeSetSelector localFP localIP localSP stackLimit stackPage stackPages method instructionPointer stackPointer framePointer localReturnValue localAbsentReceiver localAbsentReceiverOrZero extA extB primitiveFunctionPointer methodCache nsMethodCache atCache lkupClassTag lkupClass methodDictLinearSearchLimit highestRunnableProcessPriority nextWakeupUsecs nextPollUsecs inIOProcessEvents interruptKeycode interruptPending savedWindowSize imageHeaderFlags fullScreenFlag deferDisplayUpdates pendingFinalizationSignals extraVMMemory interpreterProxy showSurfaceFn primitiveTable primitiveAccessorDepthTable externalPrimitiveTable externalPrimitiveTableFirstFreeIndex overflowedPage extraFramesToMoveOnOverflow globalSessionID jmpBuf jmpDepth suspendedCallbacks suspendedMethods numStackPages desiredNumStackPages desiredEdenBytes classNameIndex thisClassIndex metaclassNumSlots interruptCheckChain suppressHeartbeatFlag breakSelector breakSelectorLength l ongRunningPrimitiveCheckMethod longRunningPrimitiveCheckSemaphore longRunningPrimitiveStartUsecs longRunningPrimitiveStopUsecs longRunningPrimitiveGCUsecs longRunningPrimitiveCheckSequenceNumber longRunningPrimitiveSignalUndelivered checkAllocFiller tempOop tempOop2 tempOop3 theUnknownShort the2ndUnknownShort imageFloatsBigEndian maxExtSemTabSizeSet lastMethodCacheProbeWrite gcSemaphoreIndex classByteArrayCompactIndex checkedPluginName statForceInterruptCheck statStackOverflow statStackPageDivorce statCheckForEvents statProcessSwitch statIOProcessEvents statPendingFinalizationSignals nativeSP nativeStackPointer lowcodeCalloutState shadowCallStackPointer' classVariableNames: 'AccessModifierPrivate AccessModifierProtected AccessModifierPublic AltBytecodeEncoderClassName AltLongStoreBytecode AlternateHeaderHasPrimFlag AlternateHeaderIsOptimizedFlag AlternateHeaderNumLiteralsMask AtCacheFixedFields AtCacheFmt AtCacheMask AtCacheOop AtCacheSize AtCacheTotalSize AtPutBase BytecodeEncoderClassName BytecodeTable CacheProbeMax DirBadPath DirEntryFound DirNoMoreEntries DumpStackOnLowSpace EnclosingMixinIndex EnclosingObjectIndex EnforceAccessControl FailImbalancedPrimitives LongStoreBytecode MaxExternalPrimitiveTableSize MaxJumpBuf MaxPrimitiveIndex MaxQuickPrimitiveIndex MethodHeaderArgCountShift MethodHeaderFlagBitPosition MethodHeaderTempCountShift MixinIndex PrimNumberDoExternalCall PrimNumberExternalCall PrimNumberFFICall PrimitiveExternalCallIndex PrimitiveTable StackPageReachedButUntraced StackPageTraceInvalid StackPageTraced StackPageUnreached V3PrimitiveBitsMask' poolDictionaries: 'VMBasicConstants VMBytecodeConstants VMMethodCacheConstants VMObjectIndices VMSpurObjectRepresentationConstants VMSqueakClassIndices VMStackFrameOffsets' category: 'VMMaker-Interpreter'! !StackInterpreter commentStamp: 'eem 12/5/2014 11:32' prior: 0! This class is a complete implementation of the Smalltalk-80 virtual machine, derived originally from the Blue Book specification but quite different in some areas. This VM supports Closures but *not* old-style BlockContexts. It has been modernized with 32-bit pointers, better management of Contexts (see next item), and attention to variable use that allows the CCodeGenerator (qv) to keep, eg, the instruction pointer and stack pointer in registers as well as keeping most simple variables in a global array that seems to improve performance for most platforms. The VM does not use Contexts directly. Instead Contexts serve as proxies for a more conventional stack format that is invisible to the image. There is considerable explanation at http://www.mirandabanda.org/cogblog/2009/01/14/under-cover-contexts-and-the…. The VM maintains a fixed-size stack zone divided into pages, each page being capable of holding several method/block activations. A send establishes a new frame in the current stack page, a return returns to the previous frame. This eliminates allocation/deallocation of contexts and the moving of receiver and arguments from caller to callee on each send/return. Contexts are created lazily when an activation needs a context (creating a block, explicit use of thisContext, access to sender when sender is a frame, or linking of stack pages together). Contexts are either conventional and heap-resident ("single") or "married" and serve as proxies for their corresponding frame or "widowed", meaning that their spouse f rame has been returned from (died). A married context is specially marked (more details in the code) and refers to its frame. Likewise a married frame is specially marked and refers to its context. In addition to SmallInteger arithmetic and Floats, the VM supports logic on 32-bit PositiveLargeIntegers, thus allowing it to simulate itself much more effectively than would otherwise be the case. StackInterpreter and subclasses support multiple memory managers. Currently there are two. NewMemoryManager is a slightly refined version of ObjectMemory, and is the memory manager and garbage collector for the original Squeak object representation as described in "Back to the Future The Story of Squeak, A Practical Smalltalk Written in Itself", see http://ftp.squeak.org/docs/OOPSLA.Squeak.html. Spur is a faster, more regular object representation that is designed for more performance and functionality, and to have a common header format for both 32-bit and 64-bit versions. You can read about it in SpurMemoryManager's class comment. There is also a video of a presentation at ESUG 2014 (https://www.youtube.com/watch?v=k0nBNS1aHZ4), along with slides (http://www.slideshare.net/esug/spur-a-new-object-representation-for-cog?rel…).! Item was changed: ----- Method: StackInterpreter class>>mustBeGlobal: (in category 'translation') ----- mustBeGlobal: var "Answer if a variable must be global and exported. Used for inst vars that are accessed from VM support code." ^(super mustBeGlobal: var) or: [(self objectMemoryClass mustBeGlobal: var) or: [(#('interpreterProxy' 'interpreterVersion' 'inIOProcessEvents' 'deferDisplayUpdates' 'extraVMMemory' 'showSurfaceFn' 'desiredNumStackPages' 'desiredEdenBytes' 'breakSelector' 'breakSelectorLength' 'sendTrace' 'checkAllocFiller' 'checkedPluginName' + 'suppressHeartbeatFlag' 'debugCallbackPath') includes: var) - 'suppressHeartbeatFlag') includes: var) or: [ "This allows slow machines to define bytecodeSetSelector as 0 to avoid the interpretation overhead." MULTIPLEBYTECODESETS not and: [var = 'bytecodeSetSelector']]]]! Item was changed: ----- Method: StackInterpreter class>>preambleCCode (in category 'translation') ----- preambleCCode ^ '/* Disable Intel compiler inlining of warning which is used for breakpoints */ #pragma auto_inline(off) sqInt warnpid, erroronwarn; void warning(char *s) { /* Print an error message but don''t necessarily exit. */ if (erroronwarn) error(s); if (warnpid) printf("\n%s pid %ld\n", s, (long)warnpid); else printf("\n%s\n", s); } void warningat(char *s, int l) { /* ditto with line number. */ /* use alloca to call warning so one does not have to remember to set two breakpoints... */ char *sl = alloca(strlen(s) + 16); sprintf(sl, "%s %d", s, l); warning(sl); } #pragma auto_inline(on) void invalidCompactClassError(char *s) { /* Print a (compact) class index error message and exit. */ #if SPURVM printf("\nClass %s does not have the required class index\n", s); #else printf("\nClass %s does not have the required compact class index\n", s); #endif exit(-1); } /* * Define sigsetjmp and siglongjmp to be the most minimal setjmp/longjmp available on the platform. */ + #undef sigsetjmp + #undef siglongjmp #if WIN32 # define sigsetjmp(jb,ssmf) setjmp(jb) # define siglongjmp(jb,v) longjmp(jb,v) #else # define sigsetjmp(jb,ssmf) _setjmp(jb) # define siglongjmp(jb,v) _longjmp(jb,v) #endif #define odd(v) ((int)(v)&1) #define even(v) (!!odd(v)) '! Item was changed: ----- Method: StackInterpreter>>returnAs:ThroughCallback:Context: (in category 'callback support') ----- returnAs: returnTypeOop ThroughCallback: vmCallbackContext Context: callbackMethodContext "callbackMethodContext is an activation of invokeCallback:[stack:registers:jmpbuf:]. Its sender is the VM's state prior to the callback. Reestablish that state (via longjmp), and mark callbackMethodContext as dead." <export: true> <var: #vmCallbackContext type: #'VMCallbackContext *'> | calloutMethodContext theFP thePage | <var: #theFP type: #'char *'> <var: #thePage type: #'StackPage *'> + debugCallbackPath := 0. ((self isIntegerObject: returnTypeOop) and: [self isLiveContext: callbackMethodContext]) ifFalse: + [debugCallbackPath := 1. + ^false]. - [^false]. calloutMethodContext := self externalInstVar: SenderIndex ofContext: callbackMethodContext. (self isLiveContext: calloutMethodContext) ifFalse: + [debugCallbackPath := 2. + ^false]. + debugCallbackPath := 4. - [^false]. "We're about to leave this stack page; must save the current frame's instructionPointer." self push: instructionPointer. self externalWriteBackHeadFramePointers. "Mark callbackMethodContext as dead; the common case is that it is the current frame. We go the extra mile for the debugger." (self isSingleContext: callbackMethodContext) + ifTrue: [self markContextAsDead: callbackMethodContext. debugCallbackPath := debugCallbackPath bitOr: 8] - ifTrue: [self markContextAsDead: callbackMethodContext] ifFalse: + [debugCallbackPath := debugCallbackPath bitOr: 16. + theFP := self frameOfMarriedContext: callbackMethodContext. - [theFP := self frameOfMarriedContext: callbackMethodContext. framePointer = theFP "common case" ifTrue: + [debugCallbackPath := debugCallbackPath bitOr: 32. + (self isBaseFrame: theFP) + ifTrue: [stackPages freeStackPage: stackPage. debugCallbackPath := debugCallbackPath bitOr: 64] - [(self isBaseFrame: theFP) - ifTrue: [stackPages freeStackPage: stackPage] ifFalse: "calloutMethodContext is immediately below on the same page. Make it current." + [debugCallbackPath := debugCallbackPath bitOr: 128. + instructionPointer := (self frameCallerSavedIP: framePointer) asUnsignedInteger. - [instructionPointer := (self frameCallerSavedIP: framePointer) asUnsignedInteger. stackPointer := framePointer + (self frameStackedReceiverOffset: framePointer) + objectMemory wordSize. framePointer := self frameCallerFP: framePointer. self setMethod: (self frameMethodObject: framePointer). self restoreCStackStateForCallbackContext: vmCallbackContext. "N.B. siglongjmp is defines as _longjmp on non-win32 platforms. This matches the use of _setjmp in ia32abicc.c." self siglong: vmCallbackContext trampoline jmp: (self integerValueOf: returnTypeOop). ^true]] ifFalse: + [debugCallbackPath := debugCallbackPath bitOr: 256. + self externalDivorceFrame: theFP andContext: callbackMethodContext. - [self externalDivorceFrame: theFP andContext: callbackMethodContext. self markContextAsDead: callbackMethodContext]]. "Make the calloutMethodContext the active frame. The case where calloutMethodContext is immediately below callbackMethodContext on the same page is handled above." (self isStillMarriedContext: calloutMethodContext) ifTrue: + [debugCallbackPath := debugCallbackPath bitOr: 512. + theFP := self frameOfMarriedContext: calloutMethodContext. - [theFP := self frameOfMarriedContext: calloutMethodContext. thePage := stackPages stackPageFor: theFP. "findSPOf:on: points to the word beneath the instructionPointer, but there is no instructionPointer on the top frame of the current page." self assert: thePage ~= stackPage. stackPointer := (self findSPOf: theFP on: thePage) - objectMemory wordSize. framePointer := theFP] ifFalse: + [debugCallbackPath := debugCallbackPath bitOr: 1024. + thePage := self makeBaseFrameFor: calloutMethodContext. - [thePage := self makeBaseFrameFor: calloutMethodContext. framePointer := thePage headFP. stackPointer := thePage headSP]. instructionPointer := self popStack. self setMethod: (objectMemory fetchPointer: MethodIndex ofObject: calloutMethodContext). self setStackPageAndLimit: thePage. self restoreCStackStateForCallbackContext: vmCallbackContext. + debugCallbackPath := debugCallbackPath bitOr: 2048. "N.B. siglongjmp is defines as _longjmp on non-win32 platforms. This matches the use of _setjmp in ia32abicc.c." self siglong: vmCallbackContext trampoline jmp: (self integerValueOf: returnTypeOop). "NOTREACHED" ^true! Item was changed: ----- Method: StackToRegisterMappingCogit>>genJumpIf:to: (in category 'bytecode generator support') ----- genJumpIf: boolean to: targetBytecodePC <inline: false> | desc fixup ok | <var: #desc type: #'CogSimStackEntry *'> <var: #fixup type: #'BytecodeFixup *'> <var: #ok type: #'AbstractInstruction *'> self ssFlushTo: simStackPtr - 1. desc := self ssTop. self ssPop: 1. (desc type == SSConstant and: [desc constant = objectMemory trueObject or: [desc constant = objectMemory falseObject]]) ifTrue: ["Must arrange there's a fixup at the target whether it is jumped to or not so that the simStackPtr can be kept correct." fixup := self ensureFixupAt: targetBytecodePC - initialPC. "Must annotate the bytecode for correct pc mapping." self annotateBytecode: (desc constant = boolean ifTrue: [self Jump: fixup] ifFalse: [self prevInstIsPCAnnotated ifTrue: [self Nop] ifFalse: [self Label]]). extA := 0. ^0]. desc popToReg: TempReg. "Cunning trick by LPD. If true and false are contiguous subtract the smaller. Correct result is either 0 or the distance between them. If result is not 0 or their distance send mustBeBoolean." self assert: (objectMemory objectAfter: objectMemory falseObject) = objectMemory trueObject. self genSubConstant: boolean R: TempReg. self JumpZero: (self ensureFixupAt: targetBytecodePC - initialPC). self extASpecifiesNoMustBeBoolean ifTrue: [ extA := 0. self annotateBytecode: self lastOpcode. ^ 0]. extA := 0. . self CmpCq: (boolean = objectMemory falseObject ifTrue: [objectMemory trueObject - objectMemory falseObject] ifFalse: [objectMemory falseObject - objectMemory trueObject]) R: TempReg. ok := self JumpZero: 0. + self genCallMustBeBooleanFor: boolean. - self CallRT: (boolean = objectMemory falseObject - ifTrue: [ceSendMustBeBooleanAddFalseTrampoline] - ifFalse: [ceSendMustBeBooleanAddTrueTrampoline]). ok jmpTarget: (self annotateBytecode: self Label). ^0!

3 2

CogSpur crash on OS X when resizing with Moom
by Bernhard Pieber 09 Dec '16

09 Dec '16

Dear VM developers, I can reliably crash the latest stable CogSpur.r3732.app using the Squeak5.1-15113.image when I resize it with Moom (http://manytricks.com/moom/) right after starting the image. I tried to reproduce it by resizing it manually without Moom. I *think* it happened occasionally when resizing manually, but I could not reproduce it today. Versions up to r3427 do not crash. The crash happens starting with version r3602. With the latest unstable version 201606301459 built by Travis the crash still happens. I attach the crash dump for version r3732. Maybe it is helpful. Thanks for all your work! Cheers, Bernhard

3 4

← Newer
1
...
4
5
6
7
8
9
10
11
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev December 2016