Vm-dev December 2015

vm-dev@lists.squeakfoundation.org

33 participants
207 discussions

VM Maker: VMMaker.oscog-rmacnak.1554.mcz
by commits＠source.squeak.org 05 Dec '15

05 Dec '15

Ryan Macnak uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-rmacnak.1554.mcz ==================== Summary ==================== Name: VMMaker.oscog-rmacnak.1554 Author: rmacnak Time: 5 December 2015, 2:19:42.958 pm UUID: 973f6adb-6fb4-4648-ab13-64872ee85702 Ancestors: VMMaker.oscog-eem.1553 MIPS: Get simulation just past the first code compaction. Fail shortly thereafter. CPIC relocation: fix conflation of unconditional and conditional jumps. =============== Diff against VMMaker.oscog-eem.1553 =============== Item was changed: ----- Method: CogAbstractInstruction>>instructionSizeAt: (in category 'disassembly') ----- instructionSizeAt: pc "Answer the instruction size at pc. This is used in method disassembly to decode the jumps in block dispatch to discover where block methods occur within a larger method." + ^self subclassResponsibility! - ^4! Item was added: + ----- Method: CogMIPSELCompiler>>instructionSizeAt: (in category 'disassembly') ----- + instructionSizeAt: pc + "Answer the instruction size at pc." + ^4! Item was changed: ----- Method: CogMIPSELCompiler>>isCallPrecedingReturnPC: (in category 'testing') ----- isCallPrecedingReturnPC: mcpc "Assuming mcpc is a send return pc answer if the instruction before it is a call (not a CallFull)." "cogit disassembleFrom: mcpc - 8 to: mcpc." (self opcodeAtAddress: mcpc - 8) = JAL ifTrue: [^true]. ((self opcodeAtAddress: mcpc - 8) = SPECIAL + and: [(self functionAtAddress: mcpc - 8) = JALR]) ifTrue: [^true]. - and: [(self opcodeAtAddress: mcpc - 8) = JALR]) ifTrue: [^true]. ^false! Item was added: + ----- Method: CogMIPSELCompiler>>isJumpAt: (in category 'testing') ----- + isJumpAt: pc + cogit disassembleFrom: pc to: pc + 4. + + (self opcodeAtAddress: pc) = J ifTrue: [^true]. + + (self opcodeAtAddress: pc) = SPECIAL ifTrue: [ + (self functionAtAddress: pc) = JR ifTrue: [^true]. + ]. + + (self opcodeAtAddress: pc) = BEQ ifTrue: [^true]. + (self opcodeAtAddress: pc) = BNE ifTrue: [^true]. + (self opcodeAtAddress: pc) = BLEZ ifTrue: [^true]. + (self opcodeAtAddress: pc) = BGTZ ifTrue: [^true]. + + (self opcodeAtAddress: pc) = REGIMM ifTrue: [ + (self rtAtAddress: pc) = BLTZ ifTrue: [^true]. + (self rtAtAddress: pc) = BGEZ ifTrue: [^true]. + ]. + + ^false! Item was added: + ----- Method: CogMIPSELCompiler>>jumpTargetPCAt: (in category 'disassembly') ----- + jumpTargetPCAt: pc + <returnTypeC: #usqInt> + "cogit disassembleFrom: pc to: pc + 4." + + (self opcodeAtAddress: pc) = J ifTrue: [^self targetFromJTypeAtAddress: pc]. + + (self opcodeAtAddress: pc) = BEQ ifTrue: [^self targetFromITypeAtAddress: pc]. + (self opcodeAtAddress: pc) = BNE ifTrue: [^self targetFromITypeAtAddress: pc]. + (self opcodeAtAddress: pc) = BLEZ ifTrue: [^self targetFromITypeAtAddress: pc]. + (self opcodeAtAddress: pc) = BGTZ ifTrue: [^self targetFromITypeAtAddress: pc]. + (self opcodeAtAddress: pc) = REGIMM ifTrue: + [(self rtAtAddress: pc) = BLTZ ifTrue: [^self targetFromITypeAtAddress: pc]. + (self rtAtAddress: pc) = BGEZ ifTrue: [^self targetFromITypeAtAddress: pc]]. + + self unreachable.! Item was added: + ----- Method: CogMIPSELCompiler>>relocateCallBeforeReturnPC:by: (in category 'inline cacheing') ----- + relocateCallBeforeReturnPC: retpc by: delta + | target | + self assert: delta \\ 4 = 0. + delta = 0 ifTrue: [^self]. + + self assert: (self opcodeAtAddress: retpc - 16) = LUI. + self assert: (self opcodeAtAddress: retpc - 12) = ORI. + self assert: (self opcodeAtAddress: retpc - 8) = SPECIAL. + self assert: (self functionAtAddress: retpc - 8) = JALR. + self assert: (objectMemory longAt: retpc - 4) = self nop. + "cogit disassembleFrom: retpc - 16 to: retpc." + + target := self literalAtAddress: retpc - 12. + target := target + delta. + self literalAtAddress: retpc - 12 put: target. + + self assert: (self opcodeAtAddress: retpc - 16) = LUI. + self assert: (self opcodeAtAddress: retpc - 12) = ORI. + self assert: (self opcodeAtAddress: retpc - 8) = SPECIAL. + self assert: (self functionAtAddress: retpc - 8) = JALR. + self assert: (objectMemory longAt: retpc - 4) = self nop. + "cogit disassembleFrom: retpc - 16 to: retpc."! Item was added: + ----- Method: CogMIPSELCompiler>>relocateJumpLongBeforeFollowingAddress:by: (in category 'inline cacheing') ----- + relocateJumpLongBeforeFollowingAddress: pc by: delta + "lui t9, stub/targetHigh + ori t9, t9, stub/targetLow + jr t9 + nop (delay slot) + ... <-- pc" + + | target | + self assert: delta \\ 4 = 0. + delta = 0 ifTrue: [^self]. + + self assert: (self opcodeAtAddress: pc - 16) = LUI. + self assert: (self opcodeAtAddress: pc - 12) = ORI. + self assert: (self opcodeAtAddress: pc - 8) = SPECIAL. + self assert: (self functionAtAddress: pc - 8) = JR. + self assert: (objectMemory longAt: pc - 4) = self nop. + "cogit disassembleFrom: pc - 16 to: pc." + + target := self literalAtAddress: pc - 12. + target := target + delta. + self literalAtAddress: pc - 12 put: pc. + + self assert: (self opcodeAtAddress: pc - 16) = LUI. + self assert: (self opcodeAtAddress: pc - 12) = ORI. + self assert: (self opcodeAtAddress: pc - 8) = SPECIAL. + self assert: (self functionAtAddress: pc - 8) = JR. + self assert: (objectMemory longAt: pc - 4) = self nop. + "cogit disassembleFrom: pc - 16 to: pc."! Item was added: + ----- Method: CogMIPSELCompiler>>relocateJumpLongConditionalBeforeFollowingAddress:by: (in category 'inline cacheing') ----- + relocateJumpLongConditionalBeforeFollowingAddress: pc by: delta + "lui t9, stub/targetHigh + ori t9, t9, stub/targetLow + jalr t9 + nop (delay slot) + ... <-- callSiteReturnAddress" + + self assert: (self opcodeAtAddress: pc - 16) = BNE. + self assert: (objectMemory longAt: pc - 12) = self nop. + self assert: (self opcodeAtAddress: pc - 8) = J. + self assert: (objectMemory longAt: pc - 4) = self nop. + "cogit disassembleFrom: pc - 16 to: pc." + + self rewriteJTypeAtAddress: pc - 8 delta: delta. + + self assert: (self opcodeAtAddress: pc - 16) = BNE. + self assert: (objectMemory longAt: pc - 12) = self nop. + self assert: (self opcodeAtAddress: pc - 8) = J. + self assert: (objectMemory longAt: pc - 4) = self nop. + "cogit disassembleFrom: pc - 16 to: pc."! 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: + ["PushCwR" + oldValue := self literalAtAddress: pc - 12. + newValue := oldValue + delta. + self literalAtAddress: pc - 12 put: newValue. + self assert: (self literalAtAddress: pc - 12) = newValue. + ^self]. - "cogit disassembleFrom: pc - 8 to: pc." + "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>>rewriteInlineCacheAt:tag:target: (in category 'inline cacheing') ----- rewriteInlineCacheAt: callSiteReturnAddress tag: cacheTag target: callTargetAddress "Rewrite an inline cache to call a different target for a new tag. This variant is used to link unlinked sends in ceSend:to:numArgs: et al. Answer the extent of the code change which is used to compute the range of the icache to flush." "MoveCwR ClassReg selectorIndex/expectedClass Call: unlinked send stub/expectedTarget Push ReceiverResult <-- callSiteReturnAddress" "lui s3, selector/tagHigh ori s3, s3, selector/tagLow lui t9, stub/targetHigh ori t9, t9, stub/targetLow jalr t9 nop (delay slot) ... <-- callSiteReturnAddress" <var: #callSiteReturnAddress type: #usqInt> <var: #callTargetAddress type: #usqInt> self assert: (self opcodeAtAddress: callSiteReturnAddress - 24) = LUI. self assert: (self opcodeAtAddress: callSiteReturnAddress - 20) = ORI. self assert: (self opcodeAtAddress: callSiteReturnAddress - 16) = LUI. self assert: (self opcodeAtAddress: callSiteReturnAddress - 12) = ORI. self assert: (self opcodeAtAddress: callSiteReturnAddress - 8) = SPECIAL. self assert: (self functionAtAddress: callSiteReturnAddress - 8) = JALR. self assert: (objectMemory longAt: callSiteReturnAddress - 4) = self nop. "cogit disassembleFrom: callSiteReturnAddress - 24 to: callSiteReturnAddress." self literalAtAddress: callSiteReturnAddress - 20 put: cacheTag. self literalAtAddress: callSiteReturnAddress - 12 put: callTargetAddress. self assert: (self opcodeAtAddress: callSiteReturnAddress - 24) = LUI. self assert: (self opcodeAtAddress: callSiteReturnAddress - 20) = ORI. self assert: (self opcodeAtAddress: callSiteReturnAddress - 16) = LUI. self assert: (self opcodeAtAddress: callSiteReturnAddress - 12) = ORI. self assert: (self opcodeAtAddress: callSiteReturnAddress - 8) = SPECIAL. self assert: (self functionAtAddress: callSiteReturnAddress - 8) = JALR. self assert: (objectMemory longAt: callSiteReturnAddress - 4) = self nop. "cogit disassembleFrom: callSiteReturnAddress - 24 to: callSiteReturnAddress." + ^24! - ^28! Item was added: + ----- Method: CogMIPSELCompiler>>rewriteJTypeAtAddress:delta: (in category 'inline cacheing') ----- + rewriteJTypeAtAddress: mcpc delta: delta + | target | + target := self targetFromJTypeAtAddress: mcpc. + target := target + delta. + self rewriteJTypeAtAddress: mcpc target: target.! Item was changed: ----- Method: CogMIPSELCompiler>>rewriteJTypeAtAddress:target: (in category 'inline cacheing') ----- rewriteJTypeAtAddress: mcpc target: newTarget | regionMask | + self assert: (self opcodeAtAddress: mcpc) = J. regionMask := 16rF0000000. "mcpc + 4: relative to delay slot not j" self assert: (mcpc + 4 bitAnd: regionMask) = (newTarget bitAnd: regionMask). objectMemory longAt: mcpc put: (self jA: newTarget).! Item was added: + ----- Method: CogMIPSELCompiler>>targetFromITypeAtAddress: (in category 'inline cacheing') ----- + targetFromITypeAtAddress: mcpc + | offset | + offset := (objectMemory longAt: mcpc) bitAnd: 16rFFFF. + offset >= 16r8000 ifTrue: [offset := offset - 16r10000]. + offset := offset << 2. + ^mcpc + offset + OneInstruction. "Offset is relative to the delay slot"! Item was changed: ----- Method: Cogit>>relocateCallsInClosedPIC: (in category 'compaction') ----- relocateCallsInClosedPIC: cPIC <var: #cPIC type: #'CogMethod *'> | delta pc entryPoint targetMethod | <var: #targetMethod type: #'CogMethod *'> delta := cPIC objectHeader. self assert: (backEnd callTargetFromReturnAddress: cPIC asInteger + missOffset) = (self picAbortTrampolineFor: cPIC cmNumArgs). backEnd relocateCallBeforeReturnPC: cPIC asInteger + missOffset by: delta negated. pc := cPIC asInteger + firstCPICCaseOffset. 1 to: cPIC cPICNumCases do: [:i| pc := self addressOfEndOfCase: i inCPIC: cPIC. entryPoint := i = 1 ifTrue: [backEnd jumpLongTargetBeforeFollowingAddress: pc] ifFalse: [backEnd jumpLongConditionalTargetBeforeFollowingAddress: pc]. "Find target from jump. Ignore jumps to the interpret and MNU calls within this PIC" (cPIC containsAddress: entryPoint) ifFalse: [targetMethod := self cCoerceSimple: entryPoint - cmNoCheckEntryOffset to: #'CogMethod *'. self assert: targetMethod cmType = CMMethod. + i = 1 ifTrue: + [backEnd + relocateJumpLongBeforeFollowingAddress: pc + by: (delta - targetMethod objectHeader) negated] + ifFalse: + [backEnd + relocateJumpLongConditionalBeforeFollowingAddress: pc + by: (delta - targetMethod objectHeader) negated]]]. - backEnd - relocateJumpLongBeforeFollowingAddress: pc - by: (delta - targetMethod objectHeader) negated]]. self assert: cPIC cPICNumCases > 0. "Finally relocate the load of the PIC and the jump to the overflow routine ceCPICMiss:receiver:" backEnd relocateMethodReferenceBeforeAddress: (self addressOfEndOfCase: 2 inCPIC: cPIC)+ backEnd loadPICLiteralByteSize by: delta. backEnd relocateJumpLongBeforeFollowingAddress: cPIC asInteger + cPICEndOfCodeOffset by: delta negated!

1 0

VM Maker: VMMaker.oscog-eem.1553.mcz
by commits＠source.squeak.org 05 Dec '15

05 Dec '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1553.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1553 Author: eem Time: 5 December 2015, 11:37:56.127 am UUID: 85428a3c-bbe7-43dd-876e-625f56beda91 Ancestors: VMMaker.oscog-eem.1552 Cogit: Implement overflow checking for primitive div that works in 32- and 64-bits. =============== Diff against VMMaker.oscog-eem.1552 =============== Item was added: + ----- Method: CogObjectRepresentation>>genJumpIsSmallIntegerValue:scratch: (in category 'compile abstract instructions') ----- + genJumpIsSmallIntegerValue: aRegister scratch: scratchReg + "Generate a test for aRegister containing an integer value in the SmallInteger range, and a jump if so, answering the jump." + <returnTypeC: #'AbstractInstruction *'> + self subclassResponsibility! Item was added: + ----- Method: CogObjectRepresentationFor32BitSpur>>genJumpIsSmallIntegerValue:scratch: (in category 'compile abstract instructions') ----- + genJumpIsSmallIntegerValue: aRegister scratch: scratchReg + "Generate a test for aRegister containing an integer value in the SmallInteger range, and a jump if so, answering the jump. + c.f. Spur32BitMemoryManager>>isIntegerValue:" + <returnTypeC: #'AbstractInstruction *'> + ^cogit + MoveR: aRegister R: scratchReg; + ArithmeticShiftRightCq: 1 R: scratchReg; + XorR: aRegister R: scratchReg; + JumpLess: 0! Item was added: + ----- Method: CogObjectRepresentationFor64BitSpur>>genJumpIsSmallIntegerValue:scratch: (in category 'compile abstract instructions') ----- + genJumpIsSmallIntegerValue: aRegister scratch: scratchReg + "Generate a test for aRegister containing an integer value in the SmallInteger range, and a jump if so, answering the jump. + c.f. Spur64BitMemoryManager>>isIntegerValue:" + <returnTypeC: #'AbstractInstruction *'> + ^cogit + MoveR: aRegister R: scratchReg; + ArithmeticShiftRightCq: 64 - self numTagBits R: scratchReg; + AddCq: 1 R: scratchReg; + AndCq: 1 << (self numTagBits + 1) - 1 R: scratchReg; "sign and top numTags bits must be the same" + CmpCq: 1 R: scratchReg; + JumpGreaterOrEqual: 0! Item was added: + ----- Method: CogObjectRepresentationForSqueakV3>>genJumpIsSmallIntegerValue:scratch: (in category 'compile abstract instructions') ----- + genJumpIsSmallIntegerValue: aRegister scratch: scratchReg + "Generate a test for aRegister containing an integer value in the SmallInteger range, and a jump if so, answering the jump. + c.f. ObjectMemory>>isIntegerValue:" + <returnTypeC: #'AbstractInstruction *'> + ^cogit + MoveR: aRegister R: scratchReg; + ArithmeticShiftRightCq: 1 R: scratchReg; + XorR: aRegister R: scratchReg; + JumpLess: 0! Item was changed: ----- Method: CogVMSimulator>>dispatchOn:in: (in category 'interpreter shell') ----- dispatchOn: anInteger in: selectorArray "Simulate a case statement via selector table lookup. The given integer must be between 0 and selectorArray size-1, inclusive. For speed, no range test is done, since it is done by the at: operation. Note that, unlike many other arrays used in the Interpreter, this method expect NO CArrayAccessor wrapping - it would duplicate the +1. Maybe this would be better updated to make it all uniform" + cogit breakPC ifNil: + [cogit breakBlock ifNotNil: + [:bb| (bb value: cogit) ifTrue: [self halt: 'breakpoint reached']]]. - cogit breakBlock ifNotNil: - [:bb| (bb value: cogit) ifTrue: [self halt: 'breakpoint reached']]. self perform: (selectorArray at: (anInteger + 1)).! Item was changed: ----- Method: CogVMSimulator>>utilitiesMenu: (in category 'UI') ----- utilitiesMenu: aMenuMorph aMenuMorph add: 'toggle transcript' action: #toggleTranscript; add: 'clone VM' action: #cloneSimulationWindow; addLine; add: 'print ext head frame' action: #printExternalHeadFrame; add: 'print int head frame' action: #printHeadFrame; add: 'print mc/cog frame' action: [self printFrame: cogit processor fp WithSP: cogit processor sp]; add: 'short print ext frame & callers' action: [self shortPrintFrameAndCallers: framePointer]; add: 'short print int frame & callers' action: [self shortPrintFrameAndCallers: localFP]; add: 'short print mc/cog frame & callers' action: [self shortPrintFrameAndCallers: cogit processor fp]; add: 'long print ext frame & callers' action: [self printFrameAndCallers: framePointer SP: stackPointer]; add: 'long print int frame & callers' action: [self printFrameAndCallers: localFP SP: localSP]; add: 'long print mc/cog frame & callers' action: [self printFrameAndCallers: cogit processor fp SP: cogit processor sp]; add: 'print frame...' action: [(self promptHex: 'print frame') ifNotNil: [:fp| self printFrame: fp]]; add: 'print call stack' action: #printCallStack; add: 'print stack call stack' action: #printStackCallStack; add: 'print stack call stack of...' action: [(self promptHex: 'frame') ifNotNil: [:fp| self printStackCallStackOf: fp]]; add: 'print call stack of...' action: [(self promptHex: 'context or process oop') ifNotNil: [:obj| self printCallStackOf: obj]]; add: 'print call stack of frame...' action: [(self promptHex: 'frame') ifNotNil: [:fp| self printCallStackFP: fp]]; add: 'print all stacks' action: #printAllStacks; add: 'write back local ptrs' action: [stackPointer := localSP. framePointer := localFP. instructionPointer := localIP. self writeBackHeadFramePointers]; add: 'write back mc ptrs' action: [stackPointer := cogit processor sp. framePointer := cogit processor fp. instructionPointer := cogit processor eip. self writeBackHeadFramePointers]; addLine; add: 'print rump C stack' action: [objectMemory printMemoryFrom: cogit processor sp to: cogit getCStackPointer]; add: 'print registers' action: [cogit processor printRegistersOn: transcript]; add: 'print register map' action: [cogit printRegisterMapOn: transcript]; add: 'disassemble method/trampoline...' action: [(self promptHex: 'pc') ifNotNil: [:pc| cogit disassembleCodeAt: pc]]; add: 'disassemble method/trampoline at pc' action: [cogit disassembleCodeAt: (((cogit codeEntryFor: cogit processor pc) isNil and: [(cogit methodZone methodFor: cogit processor pc) = 0]) ifTrue: [instructionPointer] ifFalse: [cogit processor pc])]; add: 'disassemble ext head frame method' action: [cogit disassembleMethod: (self frameMethod: framePointer)]; add: 'print oop...' action: [(self promptHex: 'print oop') ifNotNil: [:oop| self printOop: oop]]; add: 'long print oop...' action: [(self promptHex: 'print oop') ifNotNil: [:oop| self longPrintOop: oop]]; add: 'print context...' action: [(self promptHex: 'print context') ifNotNil: [:oop| self printContext: oop]]; addLine; add: 'inspect object memory' target: objectMemory action: #inspect; add: 'run leak checker' action: [Cursor execute showWhile: [self runLeakChecker]]; add: 'inspect cointerpreter' action: #inspect; add: 'inspect cogit' target: cogit action: #inspect; add: 'inspect method zone' target: cogit methodZone action: #inspect. self isThreadedVM ifTrue: [aMenuMorph add: 'inspect thread manager' target: self threadManager action: #inspect]. aMenuMorph addLine; add: 'print cog methods' target: cogMethodZone action: #printCogMethods; add: 'print cog methods with prim...' action: [(self promptNum: 'prim index') ifNotNil: [:pix| cogMethodZone printCogMethodsWithPrimitive: pix]]; add: 'print cog methods with selector...' action: [|s| s := UIManager default request: 'selector'. s notEmpty ifTrue: [s = 'nil' ifTrue: [s := nil]. cogMethodZone methodsDo: [:m| (s ifNil: [m selector = objectMemory nilObject] ifNotNil: [(objectMemory numBytesOf: m selector) = s size and: [(self str: s n: (m selector + objectMemory baseHeaderSize) cmp: (objectMemory numBytesOf: m selector)) = 0]]) ifTrue: [cogit printCogMethod: m]]]]; add: 'print cog method for...' action: [(self promptHex: 'pc') ifNotNil: [:pc| cogit printCogMethodFor: pc]]; add: 'print cog method header for...' action: [(self promptHex: 'pc') ifNotNil: [:pc| cogit printCogMethodHeaderFor: pc]]; add: 'print trampoline table' target: cogit action: #printTrampolineTable; add: 'print prim trace log' action: #dumpPrimTraceLog; add: 'report recent instructions' target: cogit action: #reportLastNInstructions; + add: 'set break pc (', (cogit breakPC isInteger ifTrue: [cogit breakPC hex] ifFalse: [cogit breakPC printString]), ')...-ve to disable' action: [(self promptHex: 'break pc') ifNotNil: [:bpc| cogit breakPC: (bpc >= 0 ifTrue: [bpc])]]; - add: 'set break pc (', (cogit breakPC isInteger ifTrue: [cogit breakPC hex] ifFalse: [cogit breakPC printString]), ')...' action: [(self promptHex: 'break pc') ifNotNil: [:bpc| cogit breakPC: bpc]]; add: (cogit singleStep ifTrue: ['no single step'] ifFalse: ['single step']) action: [cogit singleStep: cogit singleStep not]; add: (cogit printRegisters ifTrue: ['no print registers each instruction'] ifFalse: ['print registers each instruction']) action: [cogit printRegisters: cogit printRegisters not]; add: (cogit printInstructions ifTrue: ['no print instructions each instruction'] ifFalse: ['print instructions each instruction']) action: [cogit printInstructions: cogit printInstructions not]; addLine; add: 'click step' action: [cogit setClickStepBreakBlock]; add: 'set break count...' action: [|s| s := UIManager default request: 'break count (dec)'. s notEmpty ifTrue: [breakCount := Integer readFrom: s readStream]]; add: 'set break selector...' action: [|s| s := UIManager default request: 'break selector'. s notEmpty ifTrue: [self setBreakSelector: s]]; add: 'set break block...' action: [|s| s := UIManager default request: 'break block' initialAnswer: '[:theCogit| false]'. s notEmpty ifTrue: [self setBreakBlockFromString: s]]; add: 'set cogit break method...' action: [(self promptHex: 'cogit breakMethod') ifNotNil: [:bm| cogit setBreakMethod: bm]]; add: (printBytecodeAtEachStep ifTrue: ['no print bytecode each bytecode'] ifFalse: ['print bytecode each bytecode']) action: [self ensureDebugAtEachStepBlock. printBytecodeAtEachStep := printBytecodeAtEachStep not]; add: (printFrameAtEachStep ifTrue: ['no print frame each bytecode'] ifFalse: ['print frame each bytecode']) action: [self ensureDebugAtEachStepBlock. printFrameAtEachStep := printFrameAtEachStep not]. ^aMenuMorph! Item was changed: ----- Method: SimpleStackBasedCogit>>genPrimitiveDiv (in category 'primitive generators') ----- genPrimitiveDiv + | jumpNotSI jumpIsSI jumpZero jumpExact jumpSameSign convert | - | jumpNotSI jumpZero jumpExact jumpSameSign convert | <var: #convert type: #'AbstractInstruction *'> + <var: #jumpIsSI type: #'AbstractInstruction *'> <var: #jumpZero type: #'AbstractInstruction *'> <var: #jumpNotSI type: #'AbstractInstruction *'> <var: #jumpExact type: #'AbstractInstruction *'> <var: #jumpSameSign type: #'AbstractInstruction *'> self genLoadArgAtDepth: 0 into: TempReg. self MoveR: TempReg R: ClassReg. self MoveR: TempReg R: Arg1Reg. jumpNotSI := objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg. "We must shift away the tags, not just subtract them, so that the overflow case doesn't actually overflow the machine instruction." objectRepresentation genShiftAwaySmallIntegerTagsInScratchReg: ClassReg. (self lastOpcode setsConditionCodesFor: JumpZero) ifFalse: [self CmpCq: 0 R: ClassReg]. jumpZero := self JumpZero: 0. self MoveR: ReceiverResultReg R: TempReg. objectRepresentation genShiftAwaySmallIntegerTagsInScratchReg: TempReg. self DivR: ClassReg R: TempReg Quo: TempReg Rem: ClassReg. "If remainder is zero we must check for overflow." self CmpCq: 0 R: ClassReg. jumpExact := self JumpZero: 0. "If arg and remainder signs are different we must round down." self XorR: ClassReg R: Arg1Reg. (self lastOpcode setsConditionCodesFor: JumpZero) ifFalse: [self CmpCq: 0 R: Arg1Reg]. jumpSameSign := self JumpGreaterOrEqual: 0. self SubCq: 1 R: TempReg. jumpSameSign jmpTarget: (convert := self Label). objectRepresentation genConvertIntegerToSmallIntegerInReg: TempReg. self MoveR: TempReg R: ReceiverResultReg. self RetN: (self primRetNOffsetFor: 1). "test for overflow; the only case is SmallInteger minVal // -1" + jumpExact jmpTarget: self Label. + jumpIsSI := objectRepresentation genJumpIsSmallIntegerValue: TempReg scratch: Arg1Reg. + jumpIsSI jmpTarget: convert. - jumpExact jmpTarget: - (self CmpCq: (1 << (objectRepresentation numSmallIntegerBits - 1)) R: TempReg). - self JumpLess: convert. jumpZero jmpTarget: (jumpNotSI jmpTarget: self Label). ^0! Item was changed: ----- Method: StackToRegisterMappingCogit>>genPrimitiveDiv (in category 'primitive generators') ----- genPrimitiveDiv + | jumpNotSI jumpIsSI jumpZero jumpExact jumpSameSign convert | - | jumpNotSI jumpZero jumpExact jumpSameSign convert | <var: #convert type: #'AbstractInstruction *'> + <var: #jumpIsSI type: #'AbstractInstruction *'> <var: #jumpZero type: #'AbstractInstruction *'> <var: #jumpNotSI type: #'AbstractInstruction *'> <var: #jumpExact type: #'AbstractInstruction *'> <var: #jumpSameSign type: #'AbstractInstruction *'> self MoveR: Arg0Reg R: ClassReg. self MoveR: Arg0Reg R: Arg1Reg. jumpNotSI := objectRepresentation genJumpNotSmallInteger: Arg0Reg scratchReg: TempReg. "We must shift away the tags, not just subtract them, so that the overflow case doesn't actually overflow the machine instruction." objectRepresentation genShiftAwaySmallIntegerTagsInScratchReg: ClassReg. (self lastOpcode setsConditionCodesFor: JumpZero) ifFalse: [self CmpCq: 0 R: ClassReg]. jumpZero := self JumpZero: 0. self MoveR: ReceiverResultReg R: TempReg. objectRepresentation genShiftAwaySmallIntegerTagsInScratchReg: TempReg. self DivR: ClassReg R: TempReg Quo: TempReg Rem: ClassReg. "If remainder is zero we must check for overflow." self CmpCq: 0 R: ClassReg. jumpExact := self JumpZero: 0. "If arg and remainder signs are different we must round down." self XorR: ClassReg R: Arg1Reg. (self lastOpcode setsConditionCodesFor: JumpZero) ifFalse: [self CmpCq: 0 R: Arg1Reg]. jumpSameSign := self JumpGreaterOrEqual: 0. self SubCq: 1 R: TempReg. jumpSameSign jmpTarget: (convert := self Label). objectRepresentation genConvertIntegerToSmallIntegerInReg: TempReg. self MoveR: TempReg R: ReceiverResultReg. self RetN: 0. "test for overflow; the only case is SmallInteger minVal // -1" + jumpExact jmpTarget: self Label. + jumpIsSI := objectRepresentation genJumpIsSmallIntegerValue: TempReg scratch: Arg1Reg. + jumpIsSI jmpTarget: convert. - jumpExact jmpTarget: - (self CmpCq: (1 << (objectRepresentation numSmallIntegerBits - 1)) R: TempReg). - self JumpLess: convert. jumpZero jmpTarget: (jumpNotSI jmpTarget: self Label). ^0!

1 0

VM Maker: Cog-eem.305.mcz
by commits＠source.squeak.org 05 Dec '15

05 Dec '15

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.305.mcz ==================== Summary ==================== Name: Cog-eem.305 Author: eem Time: 5 December 2015, 11:31:07.55 am UUID: ce18f80d-28db-41ed-a361-d31604c2da7c Ancestors: Cog-eem.304 Add support for indirect jumps to the BochsX64Alien. =============== Diff against Cog-eem.304 =============== Item was changed: ----- Method: BochsX64Alien>>handleGroup5FailureAt:in:rex: (in category 'error handling') ----- handleGroup5FailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" rex: rexByteOrNil "<Integer|nil>" "Convert an execution primitive failure for a group 5 instruction into the relevant ProcessorSimulationTrap signal." | modrmByte getter | self assert: rexByteOrNil isNil. modrmByte := memoryArray byteAt: pc + 2. (modrmByte >> 3 bitAnd: 7) caseOf: { [2 "Call Ev"] -> [getter := self registerStateGetters at: (modrmByte bitAnd: 7) + 1. ^(ProcessorSimulationTrap pc: pc nextpc: pc + 2 address: (self perform: getter) type: #call) + signal]. + [4 "Jump Ev"] -> [getter := self registerStateGetters at: (modrmByte bitAnd: 7) + 1. + ^(ProcessorSimulationTrap + pc: pc + nextpc: pc + 2 + address: (self perform: getter) + type: #jump) signal] }! Item was added: + ----- Method: BochsX64Alien>>simulateJumpCallOf:memory: (in category 'execution') ----- + simulateJumpCallOf: address memory: aMemory + "Simulate a frame-building jump call of address (i.e. do not push the return pc + as this has already been done). Build a frame since + a) this is used for calls into the run-time which are unlikely to be leaf-calls, and + b) stack alignment needs to be realistic for assert checking for platforms such as Mac OS X" + self pushWord: self rbp in: aMemory. + self rbp: self rsp. + PostBuildStackDelta ~= 0 ifTrue: + [self rsp: self rsp - PostBuildStackDelta]. + self rip: address!

1 0

VM Maker: VMMaker.oscog-eem.1552.mcz
by commits＠source.squeak.org 05 Dec '15

05 Dec '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1552.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1552 Author: eem Time: 4 December 2015, 10:53:48.8 pm UUID: f86a39c0-4b4e-459d-aa15-15cadd793672 Ancestors: VMMaker.oscog-eem.1551 x64 Cogit: Fix double adding of numSLots to header in ByteString>>basicNew: Fix the simulator's defaulting of ISA so that x64 is the default if 64-bit spur is selected. Include the new scratch regs in the register map printing. =============== Diff against VMMaker.oscog-eem.1551 =============== Item was changed: ----- Method: CogObjectRepresentationFor64BitSpur>>genInnerPrimitiveNewWithArg: (in category 'primitive generators') ----- genInnerPrimitiveNewWithArg: retNoffset "Implement primitiveNewWithArg for convenient cases: - the receiver has a hash - the receiver is variable and not compiled method - single word header/num slots < numSlotsMask - the result fits in eden See superclass method for dynamic frequencies of formats. For the moment we implement only arrayFormat, firstByteFormat & firstLongFormat" | headerReg fillReg instSpecReg byteSizeReg maxSlots jumpArrayTooBig jumpByteTooBig jumpLongTooBig jumpArrayFormat jumpByteFormat jumpBytePrepDone jumpLongPrepDone jumpUnhashed jumpNElementsNonInt jumpFailCuzFixed jumpNoSpace jumpHasSlots fillLoop skip | <var: 'skip' type: #'AbstractInstruction *'> <var: 'fillLoop' type: #'AbstractInstruction *'> <var: 'jumpHasSlots' type: #'AbstractInstruction *'> <var: 'jumpNoSpace' type: #'AbstractInstruction *'> <var: 'jumpUnhashed' type: #'AbstractInstruction *'> <var: 'jumpByteFormat' type: #'AbstractInstruction *'> <var: 'jumpByteTooBig' type: #'AbstractInstruction *'> <var: 'jumpLongTooBig' type: #'AbstractInstruction *'> <var: 'jumpArrayFormat' type: #'AbstractInstruction *'> <var: 'jumpArrayTooBig' type: #'AbstractInstruction *'> <var: 'jumpFailCuzFixed' type: #'AbstractInstruction *'> <var: 'jumpBytePrepDone' type: #'AbstractInstruction *'> <var: 'jumpLongPrepDone' type: #'AbstractInstruction *'> <var: 'jumpNElementsNonInt' type: #'AbstractInstruction *'> "header will contain classIndex/class's hash & format & numSlots/fixed size" headerReg := SendNumArgsReg. "Assume there's an available scratch register on 64-bit machines" fillReg := Scratch0Reg. self assert: (cogit backEnd concreteRegister: fillReg) > 0. "inst spec will hold class's instance specification and then byte size" instSpecReg := byteSizeReg := ClassReg. "The max slots we'll allocate here are those for a single header" maxSlots := objectMemory numSlotsMask - 1. "get freeStart as early as possible so as not to wait later..." cogit MoveAw: objectMemory freeStartAddress R: Arg1Reg. "get class's hash & fail if 0" self genGetHashFieldNonImmOf: ReceiverResultReg into: headerReg. jumpUnhashed := cogit JumpZero: 0. "get index and fail if not a +ve integer" jumpNElementsNonInt := self genJumpNotSmallInteger: Arg0Reg scratch: TempReg. "get class's format inst var for inst spec (format field)" self genLoadSlot: InstanceSpecificationIndex sourceReg: ReceiverResultReg destReg: instSpecReg. cogit LogicalShiftRightCq: objectMemory fixedFieldsFieldWidth + self numSmallIntegerTagBits R: instSpecReg. cogit AndCq: objectMemory formatMask R: instSpecReg. "Add format to classIndex/format header now" cogit MoveR: instSpecReg R: TempReg. cogit LogicalShiftLeftCq: objectMemory formatShift R: TempReg. cogit AddR: TempReg R: headerReg. "get integer value of num fields in TempReg now" cogit MoveR: Arg0Reg R: TempReg. self genConvertSmallIntegerToIntegerInReg: TempReg. "dispatch on format, failing if not variable or if compiled method" cogit CmpCq: objectMemory arrayFormat R: instSpecReg. jumpArrayFormat := cogit JumpZero: 0. cogit CmpCq: objectMemory firstByteFormat R: instSpecReg. jumpByteFormat := cogit JumpZero: 0. cogit CmpCq: objectMemory firstLongFormat R: instSpecReg. jumpFailCuzFixed := cogit JumpNonZero: 0. cogit CmpCq: (objectMemory integerObjectOf: maxSlots) R: Arg0Reg. jumpLongTooBig := cogit JumpAbove: 0. "save num elements/slot size to instSpecReg" cogit MoveR: TempReg R: instSpecReg. cogit MoveCq: 0 R: fillReg. jumpLongPrepDone := cogit Jump: 0. "go allocate" jumpByteFormat jmpTarget: (cogit CmpCq: (objectMemory integerObjectOf: maxSlots * objectMemory wordSize) R: Arg0Reg). jumpByteTooBig := cogit JumpAbove: 0. "save num elements to instSpecReg" cogit MoveR: TempReg R: instSpecReg. "compute odd bits and add into headerReg; oddBits := 4 - nElements bitAnd: 3" cogit MoveCq: objectMemory wordSize R: TempReg. cogit SubR: instSpecReg R: TempReg. cogit AndCq: objectMemory wordSize - 1 R: TempReg. cogit LogicalShiftLeftCq: objectMemory formatShift R: TempReg. cogit AddR: TempReg R: headerReg. "round up num elements to numSlots in instSpecReg" cogit AddCq: objectMemory wordSize - 1 R: instSpecReg. cogit LogicalShiftRightCq: objectMemory shiftForWord R: instSpecReg. - "store numSlots to headerReg" - cogit MoveR: instSpecReg R: TempReg. - cogit LogicalShiftLeftCq: objectMemory numSlotsFullShift R: TempReg. - cogit AddR: TempReg R: headerReg. cogit MoveCq: 0 R: fillReg. jumpBytePrepDone := cogit Jump: 0. "go allocate" jumpArrayFormat jmpTarget: (cogit CmpCq: (objectMemory integerObjectOf: maxSlots) R: Arg0Reg). jumpArrayTooBig := cogit JumpAbove: 0. "save num elements/slot size to instSpecReg" cogit MoveR: TempReg R: instSpecReg. cogit MoveCq: objectMemory nilObject R: fillReg. "fall through to allocate" jumpBytePrepDone jmpTarget: (jumpLongPrepDone jmpTarget: cogit Label). "store numSlots to headerReg" cogit MoveR: instSpecReg R: TempReg. cogit LogicalShiftLeftCq: objectMemory numSlotsFullShift R: TempReg. cogit AddR: TempReg R: headerReg. "compute byte size; remember 0-sized objects still need 1 slot." cogit CmpCq: 0 R: byteSizeReg. "a.k.a. instSpecReg" jumpHasSlots := cogit JumpNonZero: 0. cogit MoveCq: objectMemory baseHeaderSize * 2 R: byteSizeReg. skip := cogit Jump: 0. "round up to allocationUnit" jumpHasSlots jmpTarget: (cogit MoveR: byteSizeReg R: TempReg). cogit AddR: TempReg R: byteSizeReg. cogit AddCq: objectMemory baseHeaderSize / objectMemory wordSize R: byteSizeReg. cogit LogicalShiftLeftCq: objectMemory shiftForWord R: byteSizeReg. skip jmpTarget: "check if allocation fits" (cogit AddR: Arg1Reg R: byteSizeReg). cogit CmpCq: objectMemory getScavengeThreshold R: byteSizeReg. jumpNoSpace := cogit JumpAboveOrEqual: 0. "get result, increment freeStart and write it back. Arg1Reg holds new freeStart, the limit of the object" cogit MoveR: Arg1Reg R: ReceiverResultReg. cogit MoveR: byteSizeReg Aw: objectMemory freeStartAddress. "write other half of header (numSlots/0 identityHash)" cogit MoveR: headerReg Mw: 0 r: ReceiverResultReg. "now fill" cogit LoadEffectiveAddressMw: objectMemory baseHeaderSize r: ReceiverResultReg R: Arg1Reg. fillLoop := cogit MoveR: fillReg Mw: 0 r: Arg1Reg. cogit AddCq: 8 R: Arg1Reg. cogit CmpR: Arg1Reg R: byteSizeReg. cogit JumpAbove: fillLoop. cogit RetN: retNoffset. jumpNoSpace jmpTarget: (jumpUnhashed jmpTarget: (jumpFailCuzFixed jmpTarget: (jumpArrayTooBig jmpTarget: (jumpByteTooBig jmpTarget: (jumpLongTooBig jmpTarget: (jumpNElementsNonInt jmpTarget: cogit Label)))))). ^0! Item was changed: ----- Method: CogRTLOpcodes class>>nameForRegister: (in category 'debug printing') ----- nameForRegister: reg "<Integer>" ^#(Arg0Reg Arg1Reg ClassReg FPReg ReceiverResultReg SPReg SendNumArgsReg TempReg DPFPReg0 DPFPReg1 DPFPReg2 DPFPReg3 DPFPReg4 DPFPReg5 DPFPReg6 DPFPReg7 + LinkReg RISCTempReg VarBaseReg PCReg + Scratch0Reg Scratch1Reg Scratch2Reg Scratch3Reg Scratch4Reg Scratch5Reg) - LinkReg RISCTempReg VarBaseReg PCReg) detect: [:sym| (classPool at: sym) = reg] ifNone: ['REG', reg printString, '?']! Item was added: + ----- Method: CogX64Compiler class>>defaultCompilerClass (in category 'translation') ----- + defaultCompilerClass + ^CogInLineLiteralsX64Compiler! Item was added: + ----- Method: CogX64Compiler>>generalPurposeRegisterMap (in category 'disassembly') ----- + generalPurposeRegisterMap + <doNotGenerate> + "Answer a Dictionary from register getter to register index." + ^Dictionary newFromPairs: + { #rax. RAX. + #rcx. RCX. + #rdx. RDX. + #rbx. RBX. + #rsi. RSI. + #rdi. RDI. + #r8. R8. + #r9. R9. + #r10. R10. + #r11. R11. + #r12. R12. + #r13. R13. + #r14. R14. + #r15. R15 }! Item was changed: ----- Method: Cogit class>>initializeMiscConstants (in category 'class initialization') ----- initializeMiscConstants super initializeMiscConstants. Debug := initializationOptions at: #Debug ifAbsent: [false]. (initializationOptions includesKey: #EagerInstructionDecoration) ifTrue: [EagerInstructionDecoration := initializationOptions at: #EagerInstructionDecoration] ifFalse: [EagerInstructionDecoration ifNil: [EagerInstructionDecoration := false]]. "speeds up single stepping but could lose fidelity" + ProcessorClass := (initializationOptions at: #ISA ifAbsentPut: [self objectMemoryClass defaultISA]) caseOf: { - ProcessorClass := (initializationOptions at: #ISA ifAbsentPut: [#IA32]) caseOf: { [#X64] -> [BochsX64Alien]. [#IA32] -> [BochsIA32Alien]. [#ARMv5] -> [GdbARMAlien]. [#MIPSEL] -> [MIPSELSimulator] }. CogCompilerClass := self activeCompilerClass. (CogCompilerClass withAllSuperclasses copyUpTo: CogAbstractInstruction) do: [:compilerClass| compilerClass initialize]. "Our criterion for which methods to JIT is literal count. The default value is 60 literals or less." MaxLiteralCountForCompile := initializationOptions at: #MaxLiteralCountForCompile ifAbsent: [60]. "we special-case 0, 1 & 2 argument sends, N is numArgs >= 3" NumSendTrampolines := 4. "Currently not even the ceImplicitReceiverTrampoline contains object references." NumObjRefsInRuntime := 0. NSCSelectorIndex := (NSSendCache instVarNames indexOf: #selector) - 1. NSCNumArgsIndex := (NSSendCache instVarNames indexOf: #numArgs) - 1. NSCClassTagIndex := (NSSendCache instVarNames indexOf: #classTag) - 1. NSCEnclosingObjectIndex := (NSSendCache instVarNames indexOf: #enclosingObject) - 1. NSCTargetIndex := (NSSendCache instVarNames indexOf: #target) - 1. NumOopsPerNSC := NSSendCache instVarNames size. "Max size to alloca when compiling. Mac OS X 10.6.8 segfaults approaching 8Mb. Linux 2.6.9 segfaults above 11Mb. WIndows XP segfaults approaching 2Mb." MaxStackAllocSize := 1024 * 1024 * 3 / 2 ! Item was added: + ----- Method: NewCoObjectMemory class>>defaultISA (in category 'simulation') ----- + defaultISA + "Answer the default instruction set architecture to use for simulation." + ^#IA32! Item was added: + ----- Method: Spur32BitCoMemoryManager class>>defaultISA (in category 'simulation') ----- + defaultISA + "Answer the default instruction set architecture to use for simulation." + ^#IA32! Item was changed: + ----- Method: Spur32BitCoMemoryManager class>>simulatorClass (in category 'simulation') ----- - ----- Method: Spur32BitCoMemoryManager class>>simulatorClass (in category 'simulation only') ----- simulatorClass ^Spur32BitMMLECoSimulator! Item was added: + ----- Method: Spur64BitCoMemoryManager class>>defaultISA (in category 'simulation') ----- + defaultISA + "Answer the default instruction set architecture to use for simulation." + ^#X64! Item was changed: + ----- Method: Spur64BitCoMemoryManager class>>simulatorClass (in category 'simulation') ----- - ----- Method: Spur64BitCoMemoryManager class>>simulatorClass (in category 'simulation only') ----- simulatorClass ^Spur64BitMMLECoSimulator!

1 0

VM Maker: VMMaker.oscog-eem.1551.mcz
by commits＠source.squeak.org 05 Dec '15

05 Dec '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1551.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1551 Author: eem Time: 4 December 2015, 6:54:29.867 pm UUID: 6888417d-b2bd-4ff5-9dea-d29090173d97 Ancestors: VMMaker.oscog-eem.1550 x64 Cogit: Lift restriction on OpCqR that value must be 32-bits. Correct a comment. =============== Diff against VMMaker.oscog-eem.1550 =============== Item was added: + ----- Method: CogInLineLiteralsX64Compiler>>computeSizeOfArithCqR (in category 'generate machine code') ----- + computeSizeOfArithCqR + "With CqR we assume constants are 32-bits or less." + <inline: true> + (self isQuick: (operands at: 0)) ifTrue: + [^4]. + (self isSignExtendedFourByteValue: (operands at: 0)) ifTrue: + [^(self concreteRegister: (operands at: 1)) = RAX + ifTrue: [6] + ifFalse: [7]]. + ^10 "movabsq" + 3 "r op r"! Item was changed: ----- Method: CogOutOfLineLiteralsX64Compiler>>concreteRegister: (in category 'encoding') ----- concreteRegister: registerIndex "Map a possibly abstract register into a concrete one. Abstract registers (defined in CogAbstractOpcodes) are all negative. If registerIndex is negative assume it is an abstract register. [1] Figure 3.4 Register Usage in System V Application Binary Interface AMD64 Architecture Processor Supplement N.B. RAX RCX & RDX are caller-save (scratch) registers. Hence we use RCX for class and RDX for receiver/result since these are written in all normal sends." ^registerIndex caseOf: { [TempReg] -> [RAX]. [ClassReg] -> [RCX]. [ReceiverResultReg] -> [RDX]. [SendNumArgsReg] -> [R8]. [SPReg] -> [RSP]. [FPReg] -> [RBP]. [Arg0Reg] -> [RDI]. "So as to agree with C ABI arg 0" [Arg1Reg] -> [RSI]. "So as to agree with C ABI arg 1" [VarBaseReg] -> [RBX]. "Must be callee saved" + "No need for a RISCTempReg because out-of-line literal loads imply no need for a special MoveCwR" - "No need for a RISCTempReg because out-of-line literal loads imply - no need for a special MoveCwR, given movabsq only targets RAX" "[RISCTempReg] -> [R8]." [Scratch0Reg] -> [R9]. [Scratch1Reg] -> [R10]. [Scratch2Reg] -> [R11]. [Scratch3Reg] -> [R12]. [Scratch4Reg] -> [R13]. [Scratch5Reg] -> [R14]. [Scratch6Reg] -> [R15] } otherwise: [self assert: (registerIndex between: RAX and: R15). registerIndex]! Item was changed: ----- Method: CogX64Compiler>>computeSizeOfArithCqR (in category 'generate machine code') ----- computeSizeOfArithCqR + self subclassResponsibility! - "With CqR we assume constants are 32-bits or less." - <inline: true> - ^(self isQuick: (operands at: 0)) - ifTrue: [4] - ifFalse: [(self concreteRegister: (operands at: 1)) = RAX - ifTrue: [6] - ifFalse: [7]]! Item was changed: ----- Method: CogX64Compiler>>concretizeArithCqRWithRO:raxOpcode: (in category 'generate machine code') ----- concretizeArithCqRWithRO: regOpcode raxOpcode: raxOpcode "Will get inlined into concretizeAt: switch." <inline: false> | value reg | value := operands at: 0. reg := self concreteRegister: (operands at: 1). machineCode at: 0 put: (self rexR: 0 x: 0 b: reg). (self isQuick: value) ifTrue: [machineCode at: 1 put: 16r83; at: 2 put: (self mod: ModReg RM: reg RO: regOpcode); at: 3 put: (value bitAnd: 16rFF). ^machineCodeSize := 4]. + (self isSignExtendedFourByteValue: value) ifTrue: + [reg = RAX ifTrue: + [machineCode + at: 1 put: raxOpcode; + 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). + ^machineCodeSize := 6]. + machineCode + at: 1 put: 16r81; + at: 2 put: (self mod: ModReg RM: reg RO: regOpcode); + 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]. + ^self concretizeArithCwR: (raxOpcode = 16r3D ifTrue: [16r39] ifFalse: [raxOpcode - 2])! - self assert: value >> 32 = 0. - reg = RAX ifTrue: - [machineCode - at: 1 put: raxOpcode; - 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). - ^machineCodeSize := 6]. - machineCode - at: 1 put: 16r81; - at: 2 put: (self mod: ModReg RM: reg RO: regOpcode); - 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 added: + ----- Method: CogX64Compiler>>isSignExtendedFourByteValue: (in category 'testing') ----- + isSignExtendedFourByteValue: unsigned64BitValue + "Top 32 bits all the same as the bottom 32 bits' sign bit implies we can use a sign-extended 4 byte offset." + ^((self cCode: [unsigned64BitValue >>> 32] + inSmalltalk: [(unsigned64BitValue >> 32) signedIntFromLong]) + 1 bitXor: 1) = (unsigned64BitValue >> 31 bitAnd: 1)!

1 0

VM Maker: VMMaker.oscog-eem.1550.mcz
by commits＠source.squeak.org 05 Dec '15

05 Dec '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1550.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1550 Author: eem Time: 4 December 2015, 6:02:26.372 pm UUID: 4b7ae25c-2439-4e33-aa5f-fb0210af3ca0 Ancestors: VMMaker.oscog-eem.1549 x64 Cogit: Provide a convenience method to hide the inconvenience of checking for UndefinedOperation in uses of genJump[Not]SmallInteger:. Reefactor to share genInnerPrimitiveStringAt: between 32- and 64-bit Spur obj reps. =============== Diff against VMMaker.oscog-eem.1549 =============== Item was added: + ----- Method: CogObjectRepresentation>>genJumpNotSmallInteger:scratch: (in category 'compile abstract instructions') ----- + genJumpNotSmallInteger: aRegister scratch: scratchReg + "Generate a test for aRegister containing a SmallInteger and a jump if not, answering the jump. + If necessary use scratch reg (since testing for SmallInteger may be destructive)." + <returnTypeC: #'AbstractInstruction *'> + | jumpNotInt | + <inline: true> + <var: 'jumpNotInt' type: #'AbstractInstruction *'> + jumpNotInt := self genJumpNotSmallInteger: aRegister. + jumpNotInt asInteger = UnimplementedOperation ifTrue: + [cogit MoveR: aRegister R: scratchReg. + jumpNotInt := self genJumpNotSmallIntegerInScratchReg: TempReg]. + ^jumpNotInt! Item was added: + ----- Method: CogObjectRepresentation>>genJumpSmallInteger:scratch: (in category 'compile abstract instructions') ----- + genJumpSmallInteger: aRegister scratch: scratchReg + "Generate a test for aRegister containing a SmallInteger and a jump if so, answering the jump. + If necessary use scratch reg (since testing for SmallInteger may be destructive)." + <returnTypeC: #'AbstractInstruction *'> + | jumpInt | + <inline: true> + <var: 'jumpInt' type: #'AbstractInstruction *'> + jumpInt := self genJumpSmallInteger: aRegister. + jumpInt asInteger = UnimplementedOperation ifTrue: + [cogit MoveR: aRegister R: scratchReg. + jumpInt := self genJumpSmallIntegerInScratchReg: TempReg]. + ^jumpInt! Item was removed: - ----- Method: CogObjectRepresentationFor32BitSpur>>genInnerPrimitiveStringAt: (in category 'primitive generators') ----- - genInnerPrimitiveStringAt: retNoffset - "Implement the guts of primitiveStringAt; dispatch on size" - | formatReg jumpNotIndexable jumpBadIndex done - jumpIsBytes jumpIsShorts jumpIsWords jumpWordTooBig - jumpBytesOutOfBounds jumpShortsOutOfBounds jumpWordsOutOfBounds | - <inline: true> - "c.f. StackInterpreter>>stSizeOf: SpurMemoryManager>>lengthOf:format: fixedFieldsOf:format:length:" - <var: #done type: #'AbstractInstruction *'> - <var: #jumpIsBytes type: #'AbstractInstruction *'> - <var: #jumpIsShorts type: #'AbstractInstruction *'> - <var: #jumpIsWords type: #'AbstractInstruction *'> - <var: #jumpBadIndex type: #'AbstractInstruction *'> - <var: #jumpWordTooBig type: #'AbstractInstruction *'> - <var: #jumpNotIndexable type: #'AbstractInstruction *'> - <var: #jumpBytesOutOfBounds type: #'AbstractInstruction *'> - <var: #jumpShortsOutOfBounds type: #'AbstractInstruction *'> - <var: #jumpWordsOutOfBounds type: #'AbstractInstruction *'> - - cogit MoveR: Arg0Reg R: Arg1Reg. - jumpBadIndex := self genJumpNotSmallInteger: Arg0Reg. - self genConvertSmallIntegerToIntegerInReg: Arg1Reg. - cogit SubCq: 1 R: Arg1Reg. "1-rel => 0-rel" - - self genGetFormatOf: ReceiverResultReg - into: (formatReg := SendNumArgsReg) - leastSignificantHalfOfBaseHeaderIntoScratch: nil. - - self genGetNumSlotsOf: ReceiverResultReg into: ClassReg. - - "dispatch on format in a combination of highest dynamic frequency order first and convenience. - 0 = 0 sized objects (UndefinedObject True False et al) - 1 = non-indexable objects with inst vars (Point et al) - 2 = indexable objects with no inst vars (Array et al) - 3 = indexable objects with inst vars (MethodContext AdditionalMethodState et al) - 4 = weak indexable objects with inst vars (WeakArray et al) - 5 = weak non-indexable objects with inst vars (ephemerons) (Ephemeron) - 6 unused, reserved for exotic pointer objects? - 7 Forwarded Object, 1st field is pointer, rest of fields are ignored - 8 unused, reserved for exotic non-pointer objects? - 9 (?) 64-bit indexable - 10 - 11 32-bit indexable - 12 - 15 16-bit indexable - 16 - 23 byte indexable - 24 - 31 compiled method" - cogit CmpCq: objectMemory firstByteFormat R: formatReg. - jumpIsBytes := cogit JumpGreaterOrEqual: 0. - cogit CmpCq: objectMemory firstShortFormat R: formatReg. - jumpIsShorts := cogit JumpGreaterOrEqual: 0. - cogit CmpCq: objectMemory firstLongFormat R: formatReg. - jumpIsWords := cogit JumpGreaterOrEqual: 0. - jumpNotIndexable := cogit Jump: 0. - - jumpIsBytes jmpTarget: - (cogit LogicalShiftLeftCq: objectMemory shiftForWord R: ClassReg). - cogit AndCq: objectMemory wordSize - 1 R: formatReg. - cogit SubR: formatReg R: ClassReg; - CmpR: Arg1Reg R: ClassReg. - jumpBytesOutOfBounds := cogit JumpBelowOrEqual: 0. - cogit AddCq: objectMemory baseHeaderSize R: Arg1Reg. - cogit MoveXbr: Arg1Reg R: ReceiverResultReg R: ReceiverResultReg. - done := cogit Label. - self genConvertIntegerToCharacterInReg: ReceiverResultReg. - cogit RetN: retNoffset. - - jumpIsShorts jmpTarget: - (cogit LogicalShiftLeftCq: objectMemory shiftForWord - 1 R: ClassReg). - cogit AndCq: 1 R: formatReg. - cogit SubR: formatReg R: ClassReg; - CmpR: Arg1Reg R: ClassReg. - jumpShortsOutOfBounds := cogit JumpBelowOrEqual: 0. - cogit AddR: Arg1Reg R: ReceiverResultReg. - cogit MoveM16: objectMemory baseHeaderSize r: ReceiverResultReg R: ReceiverResultReg. - cogit Jump: done. - - jumpIsWords jmpTarget: - (cogit CmpR: Arg1Reg R: ClassReg). - jumpWordsOutOfBounds := cogit JumpBelowOrEqual: 0. - cogit AddCq: objectMemory baseHeaderSize >> objectMemory shiftForWord R: Arg1Reg. - cogit MoveXwr: Arg1Reg R: ReceiverResultReg R: TempReg. - cogit SubCq: objectMemory baseHeaderSize >> objectMemory shiftForWord R: Arg1Reg. - jumpWordTooBig := self jumpNotCharacterUnsignedValueInRegister: TempReg. - cogit MoveR: TempReg R: ReceiverResultReg. - cogit Jump: done. - - jumpBytesOutOfBounds jmpTarget: - (jumpShortsOutOfBounds jmpTarget: - (jumpWordsOutOfBounds jmpTarget: - (jumpWordTooBig jmpTarget: - (jumpNotIndexable jmpTarget: - (jumpBadIndex jmpTarget: cogit Label))))). - - ^0! Item was added: + ----- Method: CogObjectRepresentationFor64BitSpur>>genConvertSmallIntegerToCharacterInReg: (in category 'compile abstract instructions') ----- + genConvertSmallIntegerToCharacterInReg: reg + "Convert the SmallInteger in reg to a Character, assuming + the SmallInteger's value is a valid character." + self assert: (objectMemory characterTag = 2 and: [objectMemory smallIntegerTag = 1]). + cogit AddCq: 1 R: reg! Item was changed: ----- Method: CogObjectRepresentationFor64BitSpur>>genInnerPrimitiveAt: (in category 'primitive generators') ----- genInnerPrimitiveAt: retNoffset "Implement the guts of primitiveAt" | formatReg jumpNotIndexable jumpImmediate jumpBadIndex jumpBytesDone jumpShortsDone jumpWordsDone jumpFixedFieldsDone jumpIsBytes jumpIsShorts jumpIsWords jumpIsArray jumpHasFixedFields jumpIsContext jumpBytesOutOfBounds jumpShortsOutOfBounds jumpWordsOutOfBounds jumpArrayOutOfBounds jumpFixedFieldsOutOfBounds | <inline: true> "c.f. StackInterpreter>>stSizeOf: SpurMemoryManager>>lengthOf:format: fixedFieldsOf:format:length:" <var: #jumpIsBytes type: #'AbstractInstruction *'> <var: #jumpIsShorts type: #'AbstractInstruction *'> <var: #jumpBadIndex type: #'AbstractInstruction *'> <var: #jumpIsContext type: #'AbstractInstruction *'> <var: #jumpImmediate type: #'AbstractInstruction *'> <var: #jumpBytesDone type: #'AbstractInstruction *'> <var: #jumpShortsDone type: #'AbstractInstruction *'> <var: #jumpWordsDone type: #'AbstractInstruction *'> <var: #jumpNotIndexable type: #'AbstractInstruction *'> <var: #jumpHasFixedFields type: #'AbstractInstruction *'> <var: #jumpFixedFieldsDone type: #'AbstractInstruction *'> <var: #jumpArrayOutOfBounds type: #'AbstractInstruction *'> <var: #jumpBytesOutOfBounds type: #'AbstractInstruction *'> <var: #jumpShortsOutOfBounds type: #'AbstractInstruction *'> <var: #jumpWordsOutOfBounds type: #'AbstractInstruction *'> <var: #jumpFixedFieldsOutOfBounds type: #'AbstractInstruction *'> jumpImmediate := self genJumpImmediate: ReceiverResultReg. cogit MoveR: Arg0Reg R: Arg1Reg. + jumpBadIndex := self genJumpNotSmallInteger: Arg0Reg scratch: TempReg. - jumpBadIndex := self genJumpNotSmallInteger: Arg0Reg. - jumpBadIndex asInteger = UnimplementedOperation ifTrue: - [cogit MoveR: Arg0Reg R: TempReg. - jumpBadIndex := self genJumpNotSmallIntegerInScratchReg: TempReg]. self genConvertSmallIntegerToIntegerInReg: Arg1Reg. cogit SubCq: 1 R: Arg1Reg. "1-rel => 0-rel" "formatReg := self formatOf: ReceiverResultReg" self genGetFormatOf: ReceiverResultReg into: (formatReg := SendNumArgsReg) leastSignificantHalfOfBaseHeaderIntoScratch: TempReg. self genGetNumSlotsOf: ReceiverResultReg into: ClassReg. "dispatch on format in a combination of highest dynamic frequency order first and convenience. 0 = 0 sized objects (UndefinedObject True False et al) 1 = non-indexable objects with inst vars (Point et al) 2 = indexable objects with no inst vars (Array et al) 3 = indexable objects with inst vars (MethodContext AdditionalMethodState et al) 4 = weak indexable objects with inst vars (WeakArray et al) 5 = weak non-indexable objects with inst vars (ephemerons) (Ephemeron) 6 unused, reserved for exotic pointer objects? 7 Forwarded Object, 1st field is pointer, rest of fields are ignored 8 unused, reserved for exotic non-pointer objects? 9 (?) 64-bit indexable 10 - 11 32-bit indexable 12 - 15 16-bit indexable 16 - 23 byte indexable 24 - 31 compiled method" cogit CmpCq: objectMemory firstByteFormat R: formatReg. jumpIsBytes := cogit JumpAboveOrEqual: 0. cogit CmpCq: objectMemory arrayFormat R: formatReg. jumpIsArray := cogit JumpZero: 0. jumpNotIndexable := cogit JumpBelow: 0. cogit CmpCq: objectMemory weakArrayFormat R: formatReg. jumpHasFixedFields := cogit JumpBelowOrEqual: 0. cogit CmpCq: objectMemory firstShortFormat R: formatReg. jumpIsShorts := cogit JumpAboveOrEqual: 0. cogit CmpCq: objectMemory firstLongFormat R: formatReg. jumpIsWords := cogit JumpAboveOrEqual: 0. "For now ignore 64-bit indexability." jumpNotIndexable jmpTarget: cogit Label. jumpNotIndexable := cogit Jump: 0. jumpIsBytes jmpTarget: (cogit LogicalShiftLeftCq: objectMemory shiftForWord R: ClassReg). cogit AndCq: objectMemory wordSize - 1 R: formatReg. cogit SubR: formatReg R: ClassReg; CmpR: Arg1Reg R: ClassReg. jumpBytesOutOfBounds := cogit JumpBelowOrEqual: 0. cogit AddCq: objectMemory baseHeaderSize R: Arg1Reg. cogit MoveXbr: Arg1Reg R: ReceiverResultReg R: ReceiverResultReg. self genConvertIntegerToSmallIntegerInReg: ReceiverResultReg. jumpBytesDone := cogit Jump: 0. jumpIsShorts jmpTarget: (cogit LogicalShiftLeftCq: objectMemory shiftForWord - 1 R: ClassReg). cogit AndCq: 1 R: formatReg. cogit SubR: formatReg R: ClassReg; CmpR: Arg1Reg R: ClassReg. jumpShortsOutOfBounds := cogit JumpBelowOrEqual: 0. cogit AddR: Arg1Reg R: ReceiverResultReg. cogit MoveM16: objectMemory baseHeaderSize r: ReceiverResultReg R: ReceiverResultReg. self genConvertIntegerToSmallIntegerInReg: ReceiverResultReg. jumpShortsDone := cogit Jump: 0. jumpIsWords jmpTarget: (cogit CmpR: Arg1Reg R: ClassReg). jumpWordsOutOfBounds := cogit JumpBelowOrEqual: 0. cogit AddCq: objectMemory baseHeaderSize >> (objectMemory shiftForWord - 1) R: Arg1Reg. cogit MoveX32r: Arg1Reg R: ReceiverResultReg R: TempReg. cogit MoveR: TempReg R: ReceiverResultReg. self genConvertIntegerToSmallIntegerInReg: ReceiverResultReg. jumpWordsDone := cogit Jump: 0. jumpHasFixedFields jmpTarget: (cogit AndCq: objectMemory classIndexMask R: TempReg). cogit MoveR: TempReg R: formatReg. cogit CmpCq: ClassMethodContextCompactIndex R: TempReg. jumpIsContext := cogit JumpZero: 0. self genGetClassObjectOfClassIndex: formatReg into: Scratch0Reg scratchReg: TempReg. self genLoadSlot: InstanceSpecificationIndex sourceReg: Scratch0Reg destReg: formatReg. self genConvertSmallIntegerToIntegerInReg: formatReg. cogit AndCq: objectMemory fixedFieldsOfClassFormatMask R: formatReg; SubR: formatReg R: ClassReg; CmpR: Arg1Reg R: ClassReg. jumpFixedFieldsOutOfBounds := cogit JumpBelowOrEqual: 0. "index is (formatReg (fixed fields) + Arg1Reg (0-rel index)) * wordSize + baseHeaderSize" cogit AddR: formatReg R: Arg1Reg. cogit AddCq: objectMemory baseHeaderSize >> objectMemory shiftForWord R: Arg1Reg. cogit MoveXwr: Arg1Reg R: ReceiverResultReg R: ReceiverResultReg. jumpFixedFieldsDone := cogit Jump: 0. jumpIsArray jmpTarget: (cogit CmpR: Arg1Reg R: ClassReg). jumpArrayOutOfBounds := cogit JumpBelowOrEqual: 0. cogit AddCq: objectMemory baseHeaderSize >> objectMemory shiftForWord R: Arg1Reg. cogit MoveXwr: Arg1Reg R: ReceiverResultReg R: ReceiverResultReg. jumpFixedFieldsDone jmpTarget: (jumpWordsDone jmpTarget: (jumpShortsDone jmpTarget: (jumpBytesDone jmpTarget: (cogit RetN: retNoffset)))). jumpFixedFieldsOutOfBounds jmpTarget: (jumpArrayOutOfBounds jmpTarget: (jumpBytesOutOfBounds jmpTarget: (jumpShortsOutOfBounds jmpTarget: (jumpWordsOutOfBounds jmpTarget: (jumpNotIndexable jmpTarget: (jumpIsContext jmpTarget: (jumpBadIndex jmpTarget: (jumpImmediate jmpTarget: cogit Label)))))))). ^0! Item was changed: ----- Method: CogObjectRepresentationFor64BitSpur>>genInnerPrimitiveNewWithArg: (in category 'primitive generators') ----- genInnerPrimitiveNewWithArg: retNoffset "Implement primitiveNewWithArg for convenient cases: - the receiver has a hash - the receiver is variable and not compiled method - single word header/num slots < numSlotsMask - the result fits in eden See superclass method for dynamic frequencies of formats. For the moment we implement only arrayFormat, firstByteFormat & firstLongFormat" | headerReg fillReg instSpecReg byteSizeReg maxSlots jumpArrayTooBig jumpByteTooBig jumpLongTooBig jumpArrayFormat jumpByteFormat jumpBytePrepDone jumpLongPrepDone jumpUnhashed jumpNElementsNonInt jumpFailCuzFixed jumpNoSpace jumpHasSlots fillLoop skip | <var: 'skip' type: #'AbstractInstruction *'> <var: 'fillLoop' type: #'AbstractInstruction *'> <var: 'jumpHasSlots' type: #'AbstractInstruction *'> <var: 'jumpNoSpace' type: #'AbstractInstruction *'> <var: 'jumpUnhashed' type: #'AbstractInstruction *'> <var: 'jumpByteFormat' type: #'AbstractInstruction *'> <var: 'jumpByteTooBig' type: #'AbstractInstruction *'> <var: 'jumpLongTooBig' type: #'AbstractInstruction *'> <var: 'jumpArrayFormat' type: #'AbstractInstruction *'> <var: 'jumpArrayTooBig' type: #'AbstractInstruction *'> <var: 'jumpFailCuzFixed' type: #'AbstractInstruction *'> <var: 'jumpBytePrepDone' type: #'AbstractInstruction *'> <var: 'jumpLongPrepDone' type: #'AbstractInstruction *'> <var: 'jumpNElementsNonInt' type: #'AbstractInstruction *'> "header will contain classIndex/class's hash & format & numSlots/fixed size" headerReg := SendNumArgsReg. "Assume there's an available scratch register on 64-bit machines" fillReg := Scratch0Reg. self assert: (cogit backEnd concreteRegister: fillReg) > 0. "inst spec will hold class's instance specification and then byte size" instSpecReg := byteSizeReg := ClassReg. "The max slots we'll allocate here are those for a single header" maxSlots := objectMemory numSlotsMask - 1. "get freeStart as early as possible so as not to wait later..." cogit MoveAw: objectMemory freeStartAddress R: Arg1Reg. "get class's hash & fail if 0" self genGetHashFieldNonImmOf: ReceiverResultReg into: headerReg. jumpUnhashed := cogit JumpZero: 0. "get index and fail if not a +ve integer" + jumpNElementsNonInt := self genJumpNotSmallInteger: Arg0Reg scratch: TempReg. - jumpNElementsNonInt := self genJumpNotSmallInteger: Arg0Reg. - jumpNElementsNonInt asInteger = UnimplementedOperation ifTrue: - [cogit MoveR: Arg0Reg R: TempReg. - jumpNElementsNonInt := self genJumpNotSmallIntegerInScratchReg: TempReg]. "get class's format inst var for inst spec (format field)" self genLoadSlot: InstanceSpecificationIndex sourceReg: ReceiverResultReg destReg: instSpecReg. cogit LogicalShiftRightCq: objectMemory fixedFieldsFieldWidth + self numSmallIntegerTagBits R: instSpecReg. cogit AndCq: objectMemory formatMask R: instSpecReg. "Add format to classIndex/format header now" cogit MoveR: instSpecReg R: TempReg. cogit LogicalShiftLeftCq: objectMemory formatShift R: TempReg. cogit AddR: TempReg R: headerReg. "get integer value of num fields in TempReg now" cogit MoveR: Arg0Reg R: TempReg. self genConvertSmallIntegerToIntegerInReg: TempReg. "dispatch on format, failing if not variable or if compiled method" cogit CmpCq: objectMemory arrayFormat R: instSpecReg. jumpArrayFormat := cogit JumpZero: 0. cogit CmpCq: objectMemory firstByteFormat R: instSpecReg. jumpByteFormat := cogit JumpZero: 0. cogit CmpCq: objectMemory firstLongFormat R: instSpecReg. jumpFailCuzFixed := cogit JumpNonZero: 0. cogit CmpCq: (objectMemory integerObjectOf: maxSlots) R: Arg0Reg. jumpLongTooBig := cogit JumpAbove: 0. "save num elements/slot size to instSpecReg" cogit MoveR: TempReg R: instSpecReg. cogit MoveCq: 0 R: fillReg. jumpLongPrepDone := cogit Jump: 0. "go allocate" jumpByteFormat jmpTarget: (cogit CmpCq: (objectMemory integerObjectOf: maxSlots * objectMemory wordSize) R: Arg0Reg). jumpByteTooBig := cogit JumpAbove: 0. "save num elements to instSpecReg" cogit MoveR: TempReg R: instSpecReg. "compute odd bits and add into headerReg; oddBits := 4 - nElements bitAnd: 3" cogit MoveCq: objectMemory wordSize R: TempReg. cogit SubR: instSpecReg R: TempReg. cogit AndCq: objectMemory wordSize - 1 R: TempReg. cogit LogicalShiftLeftCq: objectMemory formatShift R: TempReg. cogit AddR: TempReg R: headerReg. "round up num elements to numSlots in instSpecReg" cogit AddCq: objectMemory wordSize - 1 R: instSpecReg. cogit LogicalShiftRightCq: objectMemory shiftForWord R: instSpecReg. "store numSlots to headerReg" cogit MoveR: instSpecReg R: TempReg. cogit LogicalShiftLeftCq: objectMemory numSlotsFullShift R: TempReg. cogit AddR: TempReg R: headerReg. cogit MoveCq: 0 R: fillReg. jumpBytePrepDone := cogit Jump: 0. "go allocate" jumpArrayFormat jmpTarget: (cogit CmpCq: (objectMemory integerObjectOf: maxSlots) R: Arg0Reg). jumpArrayTooBig := cogit JumpAbove: 0. "save num elements/slot size to instSpecReg" cogit MoveR: TempReg R: instSpecReg. cogit MoveCq: objectMemory nilObject R: fillReg. "fall through to allocate" jumpBytePrepDone jmpTarget: (jumpLongPrepDone jmpTarget: cogit Label). "store numSlots to headerReg" cogit MoveR: instSpecReg R: TempReg. cogit LogicalShiftLeftCq: objectMemory numSlotsFullShift R: TempReg. cogit AddR: TempReg R: headerReg. "compute byte size; remember 0-sized objects still need 1 slot." cogit CmpCq: 0 R: byteSizeReg. "a.k.a. instSpecReg" jumpHasSlots := cogit JumpNonZero: 0. cogit MoveCq: objectMemory baseHeaderSize * 2 R: byteSizeReg. skip := cogit Jump: 0. "round up to allocationUnit" jumpHasSlots jmpTarget: (cogit MoveR: byteSizeReg R: TempReg). cogit AddR: TempReg R: byteSizeReg. cogit AddCq: objectMemory baseHeaderSize / objectMemory wordSize R: byteSizeReg. cogit LogicalShiftLeftCq: objectMemory shiftForWord R: byteSizeReg. skip jmpTarget: "check if allocation fits" (cogit AddR: Arg1Reg R: byteSizeReg). cogit CmpCq: objectMemory getScavengeThreshold R: byteSizeReg. jumpNoSpace := cogit JumpAboveOrEqual: 0. "get result, increment freeStart and write it back. Arg1Reg holds new freeStart, the limit of the object" cogit MoveR: Arg1Reg R: ReceiverResultReg. cogit MoveR: byteSizeReg Aw: objectMemory freeStartAddress. "write other half of header (numSlots/0 identityHash)" cogit MoveR: headerReg Mw: 0 r: ReceiverResultReg. "now fill" cogit LoadEffectiveAddressMw: objectMemory baseHeaderSize r: ReceiverResultReg R: Arg1Reg. fillLoop := cogit MoveR: fillReg Mw: 0 r: Arg1Reg. cogit AddCq: 8 R: Arg1Reg. cogit CmpR: Arg1Reg R: byteSizeReg. cogit JumpAbove: fillLoop. cogit RetN: retNoffset. jumpNoSpace jmpTarget: (jumpUnhashed jmpTarget: (jumpFailCuzFixed jmpTarget: (jumpArrayTooBig jmpTarget: (jumpByteTooBig jmpTarget: (jumpLongTooBig jmpTarget: (jumpNElementsNonInt jmpTarget: cogit Label)))))). ^0! Item was changed: ----- Method: CogObjectRepresentationForSpur>>genInnerPrimitiveAsCharacter:inReg: (in category 'primitive generators') ----- genInnerPrimitiveAsCharacter: retNOffset inReg: reg | jumpNotInt jumpOutOfRange | <var: 'jumpNotInt' type: #'AbstractInstruction *'> <var: 'jumpOutOfRange' type: #'AbstractInstruction *'> reg ~= ReceiverResultReg ifTrue: + [jumpNotInt := self genJumpNotSmallInteger: reg scratch: TempReg]. - [jumpNotInt := self genJumpNotSmallInteger: reg]. cogit MoveR: reg R: TempReg. self genConvertSmallIntegerToIntegerInReg: TempReg. + cogit CmpCq: 1 << 30 - 1 R: TempReg. - cogit CmpCq: (1 << 30) - 1 R: TempReg. jumpOutOfRange := cogit JumpAbove: 0. self genConvertSmallIntegerToCharacterInReg: reg. reg ~= ReceiverResultReg ifTrue: [cogit MoveR: reg R: ReceiverResultReg]. cogit RetN: retNOffset. jumpOutOfRange jmpTarget: cogit Label. reg ~= ReceiverResultReg ifTrue: [jumpNotInt jmpTarget: jumpOutOfRange getJmpTarget]. ^0! Item was added: + ----- Method: CogObjectRepresentationForSpur>>genInnerPrimitiveStringAt: (in category 'primitive generators') ----- + genInnerPrimitiveStringAt: retNoffset + "Implement the guts of primitiveStringAt; dispatch on size" + | formatReg jumpNotIndexable jumpBadIndex done + jumpIsBytes jumpIsShorts jumpIsWords jumpWordTooBig + jumpBytesOutOfBounds jumpShortsOutOfBounds jumpWordsOutOfBounds | + <inline: true> + "c.f. StackInterpreter>>stSizeOf: SpurMemoryManager>>lengthOf:format: fixedFieldsOf:format:length:" + <var: #done type: #'AbstractInstruction *'> + <var: #jumpIsBytes type: #'AbstractInstruction *'> + <var: #jumpIsShorts type: #'AbstractInstruction *'> + <var: #jumpIsWords type: #'AbstractInstruction *'> + <var: #jumpBadIndex type: #'AbstractInstruction *'> + <var: #jumpWordTooBig type: #'AbstractInstruction *'> + <var: #jumpNotIndexable type: #'AbstractInstruction *'> + <var: #jumpBytesOutOfBounds type: #'AbstractInstruction *'> + <var: #jumpShortsOutOfBounds type: #'AbstractInstruction *'> + <var: #jumpWordsOutOfBounds type: #'AbstractInstruction *'> + + cogit MoveR: Arg0Reg R: Arg1Reg. + jumpBadIndex := self genJumpNotSmallInteger: Arg0Reg scratch: TempReg. + self genConvertSmallIntegerToIntegerInReg: Arg1Reg. + cogit SubCq: 1 R: Arg1Reg. "1-rel => 0-rel" + + self genGetFormatOf: ReceiverResultReg + into: (formatReg := SendNumArgsReg) + leastSignificantHalfOfBaseHeaderIntoScratch: nil. + + self genGetNumSlotsOf: ReceiverResultReg into: ClassReg. + + "dispatch on format in a combination of highest dynamic frequency order first and convenience. + 0 = 0 sized objects (UndefinedObject True False et al) + 1 = non-indexable objects with inst vars (Point et al) + 2 = indexable objects with no inst vars (Array et al) + 3 = indexable objects with inst vars (MethodContext AdditionalMethodState et al) + 4 = weak indexable objects with inst vars (WeakArray et al) + 5 = weak non-indexable objects with inst vars (ephemerons) (Ephemeron) + 6 unused, reserved for exotic pointer objects? + 7 Forwarded Object, 1st field is pointer, rest of fields are ignored + 8 unused, reserved for exotic non-pointer objects? + 9 (?) 64-bit indexable + 10 - 11 32-bit indexable + 12 - 15 16-bit indexable + 16 - 23 byte indexable + 24 - 31 compiled method" + cogit CmpCq: objectMemory firstByteFormat R: formatReg. + jumpIsBytes := cogit JumpGreaterOrEqual: 0. + cogit CmpCq: objectMemory firstShortFormat R: formatReg. + jumpIsShorts := cogit JumpGreaterOrEqual: 0. + cogit CmpCq: objectMemory firstLongFormat R: formatReg. + jumpIsWords := cogit JumpGreaterOrEqual: 0. + jumpNotIndexable := cogit Jump: 0. + + jumpIsBytes jmpTarget: + (cogit LogicalShiftLeftCq: objectMemory shiftForWord R: ClassReg). + cogit AndCq: objectMemory wordSize - 1 R: formatReg. + cogit SubR: formatReg R: ClassReg; + CmpR: Arg1Reg R: ClassReg. + jumpBytesOutOfBounds := cogit JumpBelowOrEqual: 0. + cogit AddCq: objectMemory baseHeaderSize R: Arg1Reg. + cogit MoveXbr: Arg1Reg R: ReceiverResultReg R: ReceiverResultReg. + cogit backEnd byteReadsZeroExtend ifFalse: + [cogit AndCq: 255 R: ReceiverResultReg]. + done := cogit Label. + self genConvertIntegerToCharacterInReg: ReceiverResultReg. + cogit RetN: retNoffset. + + jumpIsShorts jmpTarget: + (cogit LogicalShiftLeftCq: objectMemory shiftForWord - 1 R: ClassReg). + cogit AndCq: 1 R: formatReg. + cogit SubR: formatReg R: ClassReg; + CmpR: Arg1Reg R: ClassReg. + jumpShortsOutOfBounds := cogit JumpBelowOrEqual: 0. + cogit AddR: Arg1Reg R: ReceiverResultReg. + cogit MoveM16: objectMemory baseHeaderSize r: ReceiverResultReg R: ReceiverResultReg. + cogit Jump: done. + + jumpIsWords jmpTarget: + (cogit CmpR: Arg1Reg R: ClassReg). + jumpWordsOutOfBounds := cogit JumpBelowOrEqual: 0. + cogit AddCq: objectMemory baseHeaderSize >> objectMemory shiftForWord R: Arg1Reg. + cogit MoveXwr: Arg1Reg R: ReceiverResultReg R: TempReg. + cogit SubCq: objectMemory baseHeaderSize >> objectMemory shiftForWord R: Arg1Reg. + jumpWordTooBig := self jumpNotCharacterUnsignedValueInRegister: TempReg. + cogit MoveR: TempReg R: ReceiverResultReg. + cogit Jump: done. + + jumpBytesOutOfBounds jmpTarget: + (jumpShortsOutOfBounds jmpTarget: + (jumpWordsOutOfBounds jmpTarget: + (jumpWordTooBig jmpTarget: + (jumpNotIndexable jmpTarget: + (jumpBadIndex jmpTarget: cogit Label))))). + + ^0!

1 0

VM Maker: VMMaker.oscog-eem.1549.mcz
by commits＠source.squeak.org 05 Dec '15

05 Dec '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1549.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1549 Author: eem Time: 4 December 2015, 4:19:50.516 pm UUID: 99726a9e-1891-4707-90a8-b4df377175aa Ancestors: VMMaker.oscog-eem.1548 x64 Cogit: rationalise concretize"Op"RR into two routines in both x64 and x86. Implement more Spur64Bit obj rep machinery. =============== Diff against VMMaker.oscog-eem.1548 =============== Item was removed: - ----- Method: CogIA32Compiler>>concretizeAddRR (in category 'generate machine code') ----- - concretizeAddRR - "Will get inlined into concretizeAt: switch." - <inline: true> - | regLHS regRHS | - regLHS := self concreteRegister: (operands at: 0). - regRHS := self concreteRegister: (operands at: 1). - machineCode - at: 0 put: 16r03; - at: 1 put: (self mod: ModReg RM: regLHS RO: regRHS). - ^machineCodeSize := 2! Item was removed: - ----- Method: CogIA32Compiler>>concretizeAndRR (in category 'generate machine code') ----- - concretizeAndRR - "Will get inlined into concretizeAt: switch." - <inline: true> - | regLHS regRHS | - regLHS := self concreteRegister: (operands at: 0). - regRHS := self concreteRegister: (operands at: 1). - machineCode - at: 0 put: 16r23; - at: 1 put: (self mod: ModReg RM: regLHS RO: regRHS). - ^machineCodeSize := 2! Item was removed: - ----- Method: CogIA32Compiler>>concretizeCmpRR (in category 'generate machine code') ----- - concretizeCmpRR - "Will get inlined into concretizeAt: switch." - <inline: true> - | regLHS regRHS | - "CmpRR RHS LHS computes LHS - RHS, i.e. apparently reversed. You have to think subtract." - regRHS := self concreteRegister: (operands at: 0). - regLHS := self concreteRegister: (operands at: 1). - machineCode - at: 0 put: 16r39; - at: 1 put: (self mod: ModReg RM: regLHS RO: regRHS). - ^machineCodeSize := 2! Item was removed: - ----- Method: CogIA32Compiler>>concretizeMoveRR (in category 'generate machine code') ----- - concretizeMoveRR - "Will get inlined into concretizeAt: switch." - <inline: true> - | srcReg destReg | - srcReg := self concreteRegister: (operands at: 0). - destReg := self concreteRegister: (operands at: 1). - machineCode - at: 0 put: 16r89; - at: 1 put: (self mod: ModReg RM: destReg RO: srcReg). - ^machineCodeSize := 2! Item was added: + ----- Method: CogIA32Compiler>>concretizeOpRR: (in category 'generate machine code') ----- + concretizeOpRR: opcode + | regLHS regRHS | + regLHS := self concreteRegister: (operands at: 0). + regRHS := self concreteRegister: (operands at: 1). + machineCode + at: 0 put: opcode; + at: 1 put: (self mod: ModReg RM: regLHS RO: regRHS). + ^machineCodeSize := 2! Item was removed: - ----- Method: CogIA32Compiler>>concretizeOrRR (in category 'generate machine code') ----- - concretizeOrRR - "Will get inlined into concretizeAt: switch." - <inline: true> - | regLHS regRHS | - regLHS := self concreteRegister: (operands at: 0). - regRHS := self concreteRegister: (operands at: 1). - machineCode - at: 0 put: 16r0B; - at: 1 put: (self mod: ModReg RM: regLHS RO: regRHS). - ^machineCodeSize := 2! Item was added: + ----- Method: CogIA32Compiler>>concretizeReverseOpRR: (in category 'generate machine code') ----- + concretizeReverseOpRR: opcode + | regLHS regRHS | + regRHS := self concreteRegister: (operands at: 0). + regLHS := self concreteRegister: (operands at: 1). + machineCode + at: 0 put: opcode; + at: 1 put: (self mod: ModReg RM: regLHS RO: regRHS). + ^machineCodeSize := 2! Item was removed: - ----- Method: CogIA32Compiler>>concretizeSubRR (in category 'generate machine code') ----- - concretizeSubRR - "Will get inlined into concretizeAt: switch." - <inline: true> - | regLHS regRHS | - regLHS := self concreteRegister: (operands at: 0). - regRHS := self concreteRegister: (operands at: 1). - machineCode - at: 0 put: 16r2B; - at: 1 put: (self mod: ModReg RM: regLHS RO: regRHS). - ^machineCodeSize := 2! Item was removed: - ----- Method: CogIA32Compiler>>concretizeXorRR (in category 'generate machine code') ----- - concretizeXorRR - "Will get inlined into concretizeAt: switch." - <inline: true> - | regLHS regRHS | - regLHS := self concreteRegister: (operands at: 0). - regRHS := self concreteRegister: (operands at: 1). - machineCode - at: 0 put: 16r33; - at: 1 put: (self mod: ModReg RM: regLHS RO: regRHS). - ^machineCodeSize := 2! Item was changed: ----- Method: CogIA32Compiler>>dispatchConcretize (in category 'generate machine code') ----- dispatchConcretize "Attempt to generate concrete machine code for the instruction at address. This is the inner dispatch of concretizeAt: actualAddress which exists only to get around the branch size limits in the SqueakV3 (blue book derived) bytecode set." <returnTypeC: #void> opcode caseOf: { "Noops & Pseudo Ops" [Label] -> [^self concretizeLabel]. [AlignmentNops] -> [^self concretizeAlignmentNops]. [Fill16] -> [^self concretizeFill16]. [Fill32] -> [^self concretizeFill32]. [FillFromWord] -> [^self concretizeFillFromWord]. [Nop] -> [^self concretizeNop]. "Specific Control/Data Movement" [CDQ] -> [^self concretizeCDQ]. [IDIVR] -> [^self concretizeIDIVR]. [IMULRR] -> [^self concretizeMulRR]. [CPUID] -> [^self concretizeCPUID]. [CMPXCHGAwR] -> [^self concretizeCMPXCHGAwR]. [CMPXCHGMwrR] -> [^self concretizeCMPXCHGMwrR]. [LFENCE] -> [^self concretizeFENCE: 5]. [MFENCE] -> [^self concretizeFENCE: 6]. [SFENCE] -> [^self concretizeFENCE: 7]. [LOCK] -> [^self concretizeLOCK]. [XCHGAwR] -> [^self concretizeXCHGAwR]. [XCHGMwrR] -> [^self concretizeXCHGMwrR]. [XCHGRR] -> [^self concretizeXCHGRR]. "Control" [Call] -> [^self concretizeCall]. [CallFull] -> [^self concretizeCall]. [JumpR] -> [^self concretizeJumpR]. [JumpFull] -> [^self concretizeJumpLong]. [JumpLong] -> [^self concretizeJumpLong]. [JumpLongZero] -> [^self concretizeConditionalJump: 16r4]. [JumpLongNonZero] -> [^self concretizeConditionalJump: 16r5]. [Jump] -> [^self concretizeJump]. "Table B-1 Intel® 64 and IA-32 Architectures Software Developer's Manual Volume 1: Basic Architecture" [JumpZero] -> [^self concretizeConditionalJump: 16r4]. [JumpNonZero] -> [^self concretizeConditionalJump: 16r5]. [JumpNegative] -> [^self concretizeConditionalJump: 16r8]. [JumpNonNegative] -> [^self concretizeConditionalJump: 16r9]. [JumpOverflow] -> [^self concretizeConditionalJump: 16r0]. [JumpNoOverflow] -> [^self concretizeConditionalJump: 16r1]. [JumpCarry] -> [^self concretizeConditionalJump: 16r2]. [JumpNoCarry] -> [^self concretizeConditionalJump: 16r3]. [JumpLess] -> [^self concretizeConditionalJump: 16rC]. [JumpGreaterOrEqual] -> [^self concretizeConditionalJump: 16rD]. [JumpGreater] -> [^self concretizeConditionalJump: 16rF]. [JumpLessOrEqual] -> [^self concretizeConditionalJump: 16rE]. [JumpBelow] -> [^self concretizeConditionalJump: 16r2]. [JumpAboveOrEqual] -> [^self concretizeConditionalJump: 16r3]. [JumpAbove] -> [^self concretizeConditionalJump: 16r7]. [JumpBelowOrEqual] -> [^self concretizeConditionalJump: 16r6]. [JumpFPEqual] -> [^self concretizeConditionalJump: 16r4]. [JumpFPNotEqual] -> [^self concretizeConditionalJump: 16r5]. [JumpFPLess] -> [^self concretizeConditionalJump: 16r2]. [JumpFPGreaterOrEqual] -> [^self concretizeConditionalJump: 16r3]. [JumpFPGreater] -> [^self concretizeConditionalJump: 16r7]. [JumpFPLessOrEqual] -> [^self concretizeConditionalJump: 16r6]. [JumpFPOrdered] -> [^self concretizeConditionalJump: 16rB]. [JumpFPUnordered] -> [^self concretizeConditionalJump: 16rA]. [RetN] -> [^self concretizeRetN]. [Stop] -> [^self concretizeStop]. "Arithmetic" [AddCqR] -> [^self concretizeAddCqR]. [AddCwR] -> [^self concretizeAddCwR]. + [AddRR] -> [^self concretizeOpRR: 16r03]. - [AddRR] -> [^self concretizeAddRR]. [AddRdRd] -> [^self concretizeSEE2OpRdRd: 16r58]. [AndCqR] -> [^self concretizeAndCqR]. [AndCwR] -> [^self concretizeAndCwR]. + [AndRR] -> [^self concretizeOpRR: 16r23]. - [AndRR] -> [^self concretizeAndRR]. [TstCqR] -> [^self concretizeTstCqR]. [CmpCqR] -> [^self concretizeCmpCqR]. [CmpCwR] -> [^self concretizeCmpCwR]. + [CmpRR] -> [^self concretizeReverseOpRR: 16r39]. - [CmpRR] -> [^self concretizeCmpRR]. [CmpRdRd] -> [^self concretizeCmpRdRd]. [DivRdRd] -> [^self concretizeSEE2OpRdRd: 16r5E]. [MulRdRd] -> [^self concretizeSEE2OpRdRd: 16r59]. [OrCqR] -> [^self concretizeOrCqR]. [OrCwR] -> [^self concretizeOrCwR]. + [OrRR] -> [^self concretizeOpRR: 16r0B]. - [OrRR] -> [^self concretizeOrRR]. [SubCqR] -> [^self concretizeSubCqR]. [SubCwR] -> [^self concretizeSubCwR]. + [SubRR] -> [^self concretizeOpRR: 16r2B]. - [SubRR] -> [^self concretizeSubRR]. [SubRdRd] -> [^self concretizeSEE2OpRdRd: 16r5C]. [SqrtRd] -> [^self concretizeSqrtRd]. [XorCwR] -> [^self concretizeXorCwR]. + [XorRR] -> [^self concretizeOpRR: 16r33]. - [XorRR] -> [^self concretizeXorRR]. [NegateR] -> [^self concretizeNegateR]. [LoadEffectiveAddressMwrR] -> [^self concretizeLoadEffectiveAddressMwrR]. [ArithmeticShiftRightCqR] -> [^self concretizeArithmeticShiftRightCqR]. [LogicalShiftRightCqR] -> [^self concretizeLogicalShiftRightCqR]. [LogicalShiftLeftCqR] -> [^self concretizeLogicalShiftLeftCqR]. [ArithmeticShiftRightRR] -> [^self concretizeArithmeticShiftRightRR]. [LogicalShiftLeftRR] -> [^self concretizeLogicalShiftLeftRR]. "Data Movement" [MoveCqR] -> [^self concretizeMoveCqR]. [MoveCwR] -> [^self concretizeMoveCwR]. + [MoveRR] -> [^self concretizeReverseOpRR: 16r89]. - [MoveRR] -> [^self concretizeMoveRR]. [MoveAwR] -> [^self concretizeMoveAwR]. [MoveRAw] -> [^self concretizeMoveRAw]. [MoveAbR] -> [^self concretizeMoveAbR]. [MoveRAb] -> [^self concretizeMoveRAb]. [MoveMbrR] -> [^self concretizeMoveMbrR]. [MoveRMbr] -> [^self concretizeMoveRMbr]. [MoveM16rR] -> [^self concretizeMoveM16rR]. [MoveM64rRd] -> [^self concretizeMoveM64rRd]. [MoveMwrR] -> [^self concretizeMoveMwrR]. [MoveXbrRR] -> [^self concretizeMoveXbrRR]. [MoveRXbrR] -> [^self concretizeMoveRXbrR]. [MoveXwrRR] -> [^self concretizeMoveXwrRR]. [MoveRXwrR] -> [^self concretizeMoveRXwrR]. [MoveRMwr] -> [^self concretizeMoveRMwr]. [MoveRdM64r] -> [^self concretizeMoveRdM64r]. [PopR] -> [^self concretizePopR]. [PushR] -> [^self concretizePushR]. [PushCq] -> [^self concretizePushCq]. [PushCw] -> [^self concretizePushCw]. [PrefetchAw] -> [^self concretizePrefetchAw]. "Conversion" [ConvertRRd] -> [^self concretizeConvertRRd] }! Item was added: + ----- Method: CogObjectRepresentationFor64BitSpur>>genAddSmallIntegerTagsTo: (in category 'compile abstract instructions') ----- + genAddSmallIntegerTagsTo: aRegister + cogit AddCq: 1 R: aRegister. + ^0! Item was removed: - ----- Method: CogX64Compiler>>concretizeAddRR (in category 'generate machine code') ----- - concretizeAddRR - "Will get inlined into concretizeAt: switch." - <inline: true> - | regLHS regRHS | - regLHS := self concreteRegister: (operands at: 0). - regRHS := self concreteRegister: (operands at: 1). - machineCode - at: 0 put: (self rexR: regRHS x: 0 b: regLHS); - at: 1 put: 16r03; - at: 2 put: (self mod: ModReg RM: regLHS RO: regRHS). - ^machineCodeSize := 3! Item was removed: - ----- Method: CogX64Compiler>>concretizeAndRR (in category 'generate machine code') ----- - concretizeAndRR - "Will get inlined into concretizeAt: switch." - <inline: true> - | regLHS regRHS | - regLHS := self concreteRegister: (operands at: 0). - regRHS := self concreteRegister: (operands at: 1). - machineCode - at: 0 put: (self rexR: regRHS x: 0 b: regLHS); - at: 1 put: 16r23; - at: 2 put: (self mod: ModReg RM: regLHS RO: regRHS). - ^machineCodeSize := 3! Item was removed: - ----- Method: CogX64Compiler>>concretizeCmpRR (in category 'generate machine code') ----- - concretizeCmpRR - "Will get inlined into concretizeAt: switch." - <inline: true> - | regLHS regRHS | - "CmpRR RHS LHS computes LHS - RHS, i.e. apparently reversed. You have to think subtract." - regRHS := self concreteRegister: (operands at: 0). - regLHS := self concreteRegister: (operands at: 1). - machineCode - at: 0 put: (self rexR: regRHS x: 0 b: regLHS); - at: 1 put: 16r39; - at: 2 put: (self mod: ModReg RM: regLHS RO: regRHS). - ^machineCodeSize := 3! Item was removed: - ----- Method: CogX64Compiler>>concretizeMoveRR (in category 'generate machine code') ----- - concretizeMoveRR - "Will get inlined into concretizeAt: switch." - <inline: true> - | srcReg destReg | - srcReg := self concreteRegister: (operands at: 0). - destReg := self concreteRegister: (operands at: 1). - machineCode - at: 0 put: (self rexR: srcReg x: 0 b: destReg); - at: 1 put: 16r89; - at: 2 put: (self mod: ModReg RM: destReg RO: srcReg). - ^machineCodeSize := 3! Item was added: + ----- Method: CogX64Compiler>>concretizeOpRR: (in category 'generate machine code') ----- + concretizeOpRR: opcode + | regLHS regRHS | + regLHS := self concreteRegister: (operands at: 0). + regRHS := self concreteRegister: (operands at: 1). + machineCode + at: 0 put: (self rexR: regRHS x: 0 b: regLHS); + at: 1 put: opcode; + at: 2 put: (self mod: ModReg RM: regLHS RO: regRHS). + ^machineCodeSize := 3! Item was added: + ----- Method: CogX64Compiler>>concretizeReverseOpRR: (in category 'generate machine code') ----- + concretizeReverseOpRR: opcode + | regLHS regRHS | + "CmpRR/MoveRR RHS LHS computes LHS - RHS, i.e. apparently reversed. You have to think subtract." + regRHS := self concreteRegister: (operands at: 0). + regLHS := self concreteRegister: (operands at: 1). + machineCode + at: 0 put: (self rexR: regRHS x: 0 b: regLHS); + at: 1 put: opcode; + at: 2 put: (self mod: ModReg RM: regLHS RO: regRHS). + ^machineCodeSize := 3! Item was removed: - ----- Method: CogX64Compiler>>concretizeSubRR (in category 'generate machine code') ----- - concretizeSubRR - "Will get inlined into concretizeAt: switch." - <inline: true> - | regLHS regRHS | - regLHS := self concreteRegister: (operands at: 0). - regRHS := self concreteRegister: (operands at: 1). - machineCode - at: 0 put: (self rexR: regRHS x: 0 b: regLHS); - at: 1 put: 16r2b; - at: 2 put: (self mod: ModReg RM: regLHS RO: regRHS). - ^machineCodeSize := 3! Item was removed: - ----- Method: CogX64Compiler>>concretizeXorRR (in category 'generate machine code') ----- - concretizeXorRR - "Will get inlined into concretizeAt: switch." - <inline: true> - | regLHS regRHS | - regLHS := self concreteRegister: (operands at: 0). - regRHS := self concreteRegister: (operands at: 1). - machineCode - at: 0 put: (self rexR: regRHS x: 0 b: regLHS); - at: 1 put: 16r33; - at: 2 put: (self mod: ModReg RM: regLHS RO: regRHS). - ^machineCodeSize := 3! Item was changed: ----- Method: CogX64Compiler>>dispatchConcretize (in category 'generate machine code') ----- dispatchConcretize "Attempt to generate concrete machine code for the instruction at address. This is the inner dispatch of concretizeAt: actualAddress which exists only to get around the branch size limits in the SqueakV3 (blue book derived) bytecode set." <returnTypeC: #void> opcode caseOf: { "Noops & Pseudo Ops" [Label] -> [^self concretizeLabel]. [AlignmentNops] -> [^self concretizeAlignmentNops]. [Fill16] -> [^self concretizeFill16]. [Fill32] -> [^self concretizeFill32]. [FillFromWord] -> [^self concretizeFillFromWord]. [Nop] -> [^self concretizeNop]. "Specific Control/Data Movement" [CDQ] -> [^self concretizeCDQ]. [IDIVR] -> [^self concretizeIDIVR]. [IMULRR] -> [^self concretizeMulRR]. [CPUID] -> [^self concretizeCPUID]. [CMPXCHGAwR] -> [^self concretizeCMPXCHGAwR]. [CMPXCHGMwrR] -> [^self concretizeCMPXCHGMwrR]. [LFENCE] -> [^self concretizeFENCE: 5]. [MFENCE] -> [^self concretizeFENCE: 6]. [SFENCE] -> [^self concretizeFENCE: 7]. [LOCK] -> [^self concretizeLOCK]. [XCHGAwR] -> [^self concretizeXCHGAwR]. [XCHGMwrR] -> [^self concretizeXCHGMwrR]. [XCHGRR] -> [^self concretizeXCHGRR]. "Control" [Call] -> [^self concretizeCall]. [CallFull] -> [^self concretizeCallFull]. [JumpR] -> [^self concretizeJumpR]. [JumpFull] -> [^self concretizeJumpFull]. [JumpLong] -> [^self concretizeJumpLong]. [JumpLongZero] -> [^self concretizeConditionalJump: 16r4]. [JumpLongNonZero] -> [^self concretizeConditionalJump: 16r5]. [Jump] -> [^self concretizeJump]. "Table B-1 Intel¬Æ 64 and IA-32 Architectures Software Developer's Manual Volume 1: Basic Architecture" [JumpZero] -> [^self concretizeConditionalJump: 16r4]. [JumpNonZero] -> [^self concretizeConditionalJump: 16r5]. [JumpNegative] -> [^self concretizeConditionalJump: 16r8]. [JumpNonNegative] -> [^self concretizeConditionalJump: 16r9]. [JumpOverflow] -> [^self concretizeConditionalJump: 16r0]. [JumpNoOverflow] -> [^self concretizeConditionalJump: 16r1]. [JumpCarry] -> [^self concretizeConditionalJump: 16r2]. [JumpNoCarry] -> [^self concretizeConditionalJump: 16r3]. [JumpLess] -> [^self concretizeConditionalJump: 16rC]. [JumpGreaterOrEqual] -> [^self concretizeConditionalJump: 16rD]. [JumpGreater] -> [^self concretizeConditionalJump: 16rF]. [JumpLessOrEqual] -> [^self concretizeConditionalJump: 16rE]. [JumpBelow] -> [^self concretizeConditionalJump: 16r2]. [JumpAboveOrEqual] -> [^self concretizeConditionalJump: 16r3]. [JumpAbove] -> [^self concretizeConditionalJump: 16r7]. [JumpBelowOrEqual] -> [^self concretizeConditionalJump: 16r6]. [JumpFPEqual] -> [^self concretizeConditionalJump: 16r4]. [JumpFPNotEqual] -> [^self concretizeConditionalJump: 16r5]. [JumpFPLess] -> [^self concretizeConditionalJump: 16r2]. [JumpFPGreaterOrEqual] -> [^self concretizeConditionalJump: 16r3]. [JumpFPGreater] -> [^self concretizeConditionalJump: 16r7]. [JumpFPLessOrEqual] -> [^self concretizeConditionalJump: 16r6]. [JumpFPOrdered] -> [^self concretizeConditionalJump: 16rB]. [JumpFPUnordered] -> [^self concretizeConditionalJump: 16rA]. [RetN] -> [^self concretizeRetN]. [Stop] -> [^self concretizeStop]. "Arithmetic" [AddCqR] -> [^self concretizeArithCqRWithRO: 0 raxOpcode: 15r05]. [AddCwR] -> [^self concretizeArithCwR: 16r03]. + [AddRR] -> [^self concretizeOpRR: 16r03]. - [AddRR] -> [^self concretizeAddRR]. [AddRdRd] -> [^self concretizeSEE2OpRdRd: 16r58]. [AndCqR] -> [^self concretizeArithCqRWithRO: 4 raxOpcode: 16r25]. [AndCwR] -> [^self concretizeArithCwR: 16r23]. + [AndRR] -> [^self concretizeOpRR: 16r23]. - [AndRR] -> [^self concretizeAndRR]. [TstCqR] -> [^self concretizeTstCqR]. [CmpCqR] -> [^self concretizeArithCqRWithRO: 7 raxOpcode: 16r3D]. [CmpCwR] -> [^self concretizeArithCwR: 16r39]. [CmpC32R] -> [^self concretizeCmpC32R]. + [CmpRR] -> [^self concretizeReverseOpRR: 16r39]. - [CmpRR] -> [^self concretizeCmpRR]. [CmpRdRd] -> [^self concretizeCmpRdRd]. [DivRdRd] -> [^self concretizeSEE2OpRdRd: 16r5E]. [MulRdRd] -> [^self concretizeSEE2OpRdRd: 16r59]. [OrCqR] -> [^self concretizeArithCqRWithRO: 1 raxOpcode: 16r0D]. [OrCwR] -> [^self concretizeArithCwR: 16r0B]. + [OrRR] -> [^self concretizeOpRR: 16r0B]. - [OrRR] -> [^self concretizeOrRR]. [SubCqR] -> [^self concretizeArithCqRWithRO: 5 raxOpcode: 16r2D]. [SubCwR] -> [^self concretizeArithCwR: 16r2B]. + [SubRR] -> [^self concretizeOpRR: 16r2B]. - [SubRR] -> [^self concretizeSubRR]. [SubRdRd] -> [^self concretizeSEE2OpRdRd: 16r5C]. [SqrtRd] -> [^self concretizeSqrtRd]. [XorCwR] -> [^self concretizeArithCwR: 16r33]. + [XorRR] -> [^self concretizeOpRR: 16r33]. - [XorRR] -> [^self concretizeXorRR]. [NegateR] -> [^self concretizeNegateR]. [LoadEffectiveAddressMwrR] -> [^self concretizeLoadEffectiveAddressMwrR]. [ArithmeticShiftRightCqR] -> [^self concretizeShiftCqRegOpcode: 7]. [LogicalShiftRightCqR] -> [^self concretizeShiftCqRegOpcode: 5]. [LogicalShiftLeftCqR] -> [^self concretizeShiftCqRegOpcode: 4]. [ArithmeticShiftRightRR] -> [^self concretizeShiftRegRegOpcode: 7]. [LogicalShiftLeftRR] -> [^self concretizeShiftRegRegOpcode: 4]. "Data Movement" [MoveCqR] -> [^self concretizeMoveCqR]. [MoveCwR] -> [^self concretizeMoveCwR]. [MoveC32R] -> [^self concretizeMoveC32R]. + [MoveRR] -> [^self concretizeReverseOpRR: 16r89]. - [MoveRR] -> [^self concretizeMoveRR]. [MoveAwR] -> [^self concretizeMoveAwR]. [MoveRAw] -> [^self concretizeMoveRAw]. [MoveAbR] -> [^self concretizeMoveAbR]. [MoveRAb] -> [^self concretizeMoveRAb]. [MoveMbrR] -> [^self concretizeMoveMbrR]. [MoveRMbr] -> [^self concretizeMoveRMbr]. [MoveM16rR] -> [^self concretizeMoveM16rR]. [MoveM64rRd] -> [^self concretizeMoveM64rRd]. [MoveMwrR] -> [^self concretizeMoveMwrR]. [MoveXbrRR] -> [^self concretizeMoveXbrRR]. [MoveRXbrR] -> [^self concretizeMoveRXbrR]. [MoveXwrRR] -> [^self concretizeMoveXwrRR]. [MoveRXwrR] -> [^self concretizeMoveRXwrR]. [MoveX32rRR] -> [^self concretizeMoveX32rRR]. [MoveRMwr] -> [^self concretizeMoveRMwr]. [MoveRdM64r] -> [^self concretizeMoveRdM64r]. [PopR] -> [^self concretizePopR]. [PushR] -> [^self concretizePushR]. [PushCq] -> [^self concretizePushCq]. [PushCw] -> [^self concretizePushCw]. [PrefetchAw] -> [^self concretizePrefetchAw]. "Conversion" [ConvertRRd] -> [^self concretizeConvertRRd] }!

1 0

VM Maker: Cog-eem.304.mcz
by commits＠source.squeak.org 05 Dec '15

05 Dec '15

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.304.mcz ==================== Summary ==================== Name: Cog-eem.304 Author: eem Time: 4 December 2015, 4:17:23.47 pm UUID: 5a22b146-4021-4d31-a7ab-6fe0033babc3 Ancestors: Cog-eem.303 Restore disassembleNextInstructionIn:for: to sanity. =============== Diff against Cog-eem.303 =============== Item was changed: ----- Method: CogProcessorAlien>>disassembleNextInstructionIn:for: (in category 'disassembly') ----- disassembleNextInstructionIn: memory for: aSymbolManager "<Cogit|nil>" + | arrayOfLengthAndString | - | string | self pc >= memory size ifTrue: + [| string | + string := aSymbolManager ifNotNil: - [string := aSymbolManager ifNotNil: [aSymbolManager lookupAddress: self pc]. + ^self pc hex, ' : ', (string ifNil: ['Invalid address'])]. + arrayOfLengthAndString := self primitiveDisassembleAt: self pc inMemory: memory. + (arrayOfLengthAndString isArray + and: [arrayOfLengthAndString first isInteger + and: [arrayOfLengthAndString last isString]]) ifFalse: + [^'ERROR: ', (arrayOfLengthAndString printString contractTo: 40)]. - ^self pc hex, ' : ', (string ifNil: ['Invalid address'])]. - string := self primitiveDisassembleAt: self pc inMemory: memory. - string isString ifFalse: - [^'ERROR: ', (string printString contractTo: 40)]. ^aSymbolManager + ifNil: [arrayOfLengthAndString last] + ifNotNil: [self decorateDisassembly: arrayOfLengthAndString last for: aSymbolManager fromAddress: self pc]! - ifNil: [string] - ifNotNil: [self decorateDisassembly: string for: aSymbolManager fromAddress: self pc]!

1 0

VM Maker: VMMaker.oscog-eem.1548.mcz
by commits＠source.squeak.org 04 Dec '15

04 Dec '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1548.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1548 Author: eem Time: 3 December 2015, 10:34:24.663 pm UUID: 40c57289-8839-4966-afa7-14ba4e813a46 Ancestors: VMMaker.oscog-eem.1547 x64 Cogit: Fix sizing of CmpC32R so that the jump to the next CPIC case is always short, and so reuse the x86's rewriteCPICJumpAt:target: for x64. Avoid using isCallPrecedingReturnPC: for testing if compileInterpreterPrimitive used a CallFull or a JumpFull to invoke the prim, hence allowing isCallPrecedingReturnPC:to only have to apply to calls used for sends, and hence reuse x86's isCallPrecedingReturnPC: for x64.. =============== Diff against VMMaker.oscog-eem.1547 =============== Item was changed: ----- Method: CogARMCompiler>>isCallPrecedingReturnPC: (in category 'testing') ----- isCallPrecedingReturnPC: mcpc + "Assuming mcpc is a send return pc answer if the instruction before it is a call (not a CallFull)." - "Assuming mcpc is a return pc answer if the instruction before it is a call." "There are two types of calls: BL and/BLX encoding" | call | call := self instructionBeforeAddress: mcpc. ^(self instructionIsBL: call) or:[self instructionIsBLX: call]! Item was changed: ----- Method: CogAbstractInstruction>>isCallPrecedingReturnPC: (in category 'testing') ----- isCallPrecedingReturnPC: mcpc + "Assuming mcpc is a send return pc answer if the instruction before it is a call (not a CallFull)." - "Assuming mcpc is a return pc answer if the instruction before it is a call." ^self subclassResponsibility! Item was changed: ----- Method: CogIA32Compiler>>isCallPrecedingReturnPC: (in category 'testing') ----- isCallPrecedingReturnPC: mcpc + "Assuming mcpc is a send return pc answer if the instruction before it is a call (not a CallFull)." - "Assuming mcpc is a return pc answer if the instruction before it is a call." ^(objectMemory byteAt: mcpc - 5) = 16rE8! Item was changed: ----- Method: CogMIPSELCompiler>>isCallPrecedingReturnPC: (in category 'testing') ----- isCallPrecedingReturnPC: mcpc + "Assuming mcpc is a send return pc answer if the instruction before it is a call (not a CallFull)." "cogit disassembleFrom: mcpc - 8 to: mcpc." (self opcodeAtAddress: mcpc - 8) = JAL ifTrue: [^true]. ((self opcodeAtAddress: mcpc - 8) = SPECIAL and: [(self opcodeAtAddress: mcpc - 8) = JALR]) ifTrue: [^true]. ^false! Item was changed: ----- Method: CogX64Compiler>>computeMaximumSize (in category 'generate machine code') ----- (excessive size, no diff calculated) Item was added: + ----- Method: CogX64Compiler>>isCallPrecedingReturnPC: (in category 'testing') ----- + isCallPrecedingReturnPC: mcpc + "Assuming mcpc is a send return pc answer if the instruction before it is a call (not a CallFull)." + ^(objectMemory byteAt: mcpc - 5) = 16rE8! Item was added: + ----- Method: CogX64Compiler>>loadPICLiteralByteSize (in category 'accessing') ----- + loadPICLiteralByteSize + "Answer the byte size of a MoveCwR opcode's corresponding machine code + when the argument is a PIC. This is for the self-reference at the end of a + closed PIC: leaq 0xffffffffffffff2b(%rip), %rcx : 48 8D 0D 2B FF FF FF" + <inline: true> + ^7! Item was added: + ----- Method: CogX64Compiler>>rewriteCPICJumpAt:target: (in category 'inline cacheing') ----- + rewriteCPICJumpAt: addressFollowingJump target: jumpTargetAddress + "Rewrite the short jump instruction to jump to a new cpic case target. " + <var: #addressFollowingJump type: #usqInt> + <var: #jumpTargetAddress type: #usqInt> + | callDistance | + callDistance := jumpTargetAddress - addressFollowingJump. + self assert: callDistance abs < 128. + objectMemory + byteAt: addressFollowingJump - 1 + put: (callDistance bitAnd: 16rFF). + "self cCode: '' + inSmalltalk: [cogit disassembleFrom: addressFollowingJump - 10 to: addressFollowingJump - 1]." + ^2! Item was changed: Cogit subclass: #SimpleStackBasedCogit + instanceVariableNames: 'primSetFunctionLabel primInvokeInstruction externalPrimCallOffsets externalPrimJumpOffsets externalSetPrimOffsets' - instanceVariableNames: 'primSetFunctionLabel primInvokeLabel externalPrimCallOffsets externalPrimJumpOffsets externalSetPrimOffsets' classVariableNames: '' poolDictionaries: 'VMMethodCacheConstants VMObjectIndices' category: 'VMMaker-JIT'! !SimpleStackBasedCogit commentStamp: '<historical>' prior: 0! I am the stage one JIT for Cog that does not attempt to eliminate the stack via deferred code generation.! Item was changed: ----- Method: SimpleStackBasedCogit class>>declareCVarsIn: (in category 'translation') ----- declareCVarsIn: aCCodeGenerator aCCodeGenerator var: #externalPrimCallOffsets declareC: 'sqInt externalPrimCallOffsets[MaxNumArgs + 1]'; var: #externalPrimJumpOffsets declareC: 'sqInt externalPrimJumpOffsets[MaxNumArgs + 1]'; var: #externalSetPrimOffsets declareC: 'sqInt externalSetPrimOffsets[MaxNumArgs + 1]'; var: #primSetFunctionLabel type: #'AbstractInstruction *'; + var: #primInvokeInstruction type: #'AbstractInstruction *'! - var: #primInvokeLabel type: #'AbstractInstruction *'! Item was changed: ----- Method: SimpleStackBasedCogit>>compileInterpreterPrimitive: (in category 'primitive generators') ----- compileInterpreterPrimitive: primitiveRoutine "Compile a call to an interpreter primitive. Call the C routine with the usual stack-switching dance, test the primFailCode and then either return on success or continue to the method body." <var: #primitiveRoutine declareC: 'void (*primitiveRoutine)(void)'> | flags jmp jmpSamplePrim retry continuePostSamplePrim jmpSampleNonPrim continuePostSampleNonPrim | <var: #jmp type: #'AbstractInstruction *'> <var: #retry type: #'AbstractInstruction *'> <var: #jmpSamplePrim type: #'AbstractInstruction *'> <var: #continuePostSamplePrim type: #'AbstractInstruction *'> <var: #jmpSampleNonPrim type: #'AbstractInstruction *'> <var: #continuePostSampleNonPrim type: #'AbstractInstruction *'> "Save processor fp, sp and return pc in the interpreter's frame stack and instruction pointers" self genExternalizePointersForPrimitiveCall. "Switch to the C stack." self genLoadCStackPointersForPrimCall. flags := coInterpreter primitivePropertyFlags: primitiveIndex. (flags anyMask: PrimCallDoNotJIT) ifTrue: [^ShouldNotJIT]. (flags anyMask: PrimCallCollectsProfileSamples) ifTrue: ["Test nextProfileTick for being non-zero and call checkProfileTick if so" objectMemory wordSize = 4 ifTrue: [self MoveAw: coInterpreter nextProfileTickAddress R: TempReg. self MoveAw: coInterpreter nextProfileTickAddress + objectMemory wordSize R: ClassReg. self OrR: TempReg R: ClassReg] ifFalse: [self MoveAw: coInterpreter nextProfileTickAddress R: TempReg. self CmpCq: 0 R: TempReg]. "If set, jump to record sample call." jmpSampleNonPrim := self JumpNonZero: 0. continuePostSampleNonPrim := self Label]. "Old full prim trace is in VMMaker-eem.550 and prior" self recordPrimTrace ifTrue: [self genFastPrimTraceUsing: ClassReg and: SendNumArgsReg]. "Clear the primFailCode and set argumentCount" retry := self MoveCq: 0 R: TempReg. self MoveR: TempReg Aw: coInterpreter primFailCodeAddress. methodOrBlockNumArgs ~= 0 ifTrue: [self MoveCq: methodOrBlockNumArgs R: TempReg]. self MoveR: TempReg Aw: coInterpreter argumentCountAddress. "If required, set primitiveFunctionPointer and newMethod" (flags anyMask: PrimCallNeedsPrimitiveFunction) ifTrue: [self MoveCw: primitiveRoutine asInteger R: TempReg. primSetFunctionLabel := self MoveR: TempReg Aw: coInterpreter primitiveFunctionPointerAddress]. (flags anyMask: PrimCallNeedsNewMethod+PrimCallMayCallBack) ifTrue: ["The ceActivateFailingPrimitiveMethod: machinery can't handle framelessness." (flags anyMask: PrimCallMayCallBack) ifTrue: [needsFrame := true]. methodLabel addDependent: (self annotateAbsolutePCRef: (self MoveCw: methodLabel asInteger R: ClassReg)). self MoveMw: (self offset: CogMethod of: #methodObject) r: ClassReg R: TempReg. self MoveR: TempReg Aw: coInterpreter newMethodAddress]. "Invoke the primitive" self PrefetchAw: coInterpreter primFailCodeAddress. (flags anyMask: PrimCallMayCallBack) ifTrue: "Sideways call the C primitive routine so that we return through cePrimReturnEnterCogCode." ["On Spur ceActivateFailingPrimitiveMethod: would like to retry if forwarders are found. So insist on PrimCallNeedsPrimitiveFunction being set too." self assert: (flags anyMask: PrimCallNeedsPrimitiveFunction). backEnd genSubstituteReturnAddress: ((flags anyMask: PrimCallCollectsProfileSamples) ifTrue: [cePrimReturnEnterCogCodeProfiling] ifFalse: [cePrimReturnEnterCogCode]). + primInvokeInstruction := self JumpFullRT: primitiveRoutine asInteger. - self JumpFullRT: primitiveRoutine asInteger. - primInvokeLabel := self Label. jmp := jmpSamplePrim := continuePostSamplePrim := nil] ifFalse: ["Call the C primitive routine." + primInvokeInstruction := self CallFullRT: primitiveRoutine asInteger. - self CallFullRT: primitiveRoutine asInteger. - primInvokeLabel := self Label. (flags anyMask: PrimCallCollectsProfileSamples) ifTrue: [self assert: (flags anyMask: PrimCallNeedsNewMethod). "Test nextProfileTick for being non-zero and call checkProfileTick if so" objectMemory wordSize = 4 ifTrue: [self MoveAw: coInterpreter nextProfileTickAddress R: TempReg. self MoveAw: coInterpreter nextProfileTickAddress + objectMemory wordSize R: ClassReg. self OrR: TempReg R: ClassReg] ifFalse: [self MoveAw: coInterpreter nextProfileTickAddress R: TempReg. self CmpCq: 0 R: TempReg]. "If set, jump to record sample call." jmpSamplePrim := self JumpNonZero: 0. continuePostSamplePrim := self Label]. objectRepresentation maybeCompileRetry: retry onPrimitiveFail: primitiveIndex. self maybeCompileAllocFillerCheck. "Switch back to the Smalltalk stack. Stack better be in either of these two states: success: stackPointer -> result (was receiver) arg1 ... argN return pc failure: receiver arg1 ... stackPointer -> argN return pc In either case we can push the instructionPointer or load it into the LinkRegister to reestablish the return pc" self MoveAw: coInterpreter instructionPointerAddress R: (backEnd hasLinkRegister ifTrue: [LinkReg] ifFalse: [ClassReg]). backEnd genLoadStackPointers. "Test primitive failure" self MoveAw: coInterpreter primFailCodeAddress R: TempReg. backEnd hasLinkRegister ifFalse: [self PushR: ClassReg]. "Restore return pc on CISCs" self flag: 'ask concrete code gen if move sets condition codes?'. self CmpCq: 0 R: TempReg. jmp := self JumpNonZero: 0. "Fetch result from stack" self MoveMw: (backEnd hasLinkRegister ifTrue: [0] ifFalse: [objectMemory wordSize]) r: SPReg R: ReceiverResultReg. self RetN: objectMemory wordSize]. "return to caller, popping receiver" (flags anyMask: PrimCallCollectsProfileSamples) ifTrue: ["The sample is collected by cePrimReturnEnterCogCode for external calls" jmpSamplePrim notNil ifTrue: ["Call ceCheckProfileTick: to record sample and then continue." jmpSamplePrim jmpTarget: self Label. self assert: (flags anyMask: PrimCallNeedsNewMethod). self CallFullRT: (self cCode: [#ceCheckProfileTick asUnsignedLong] inSmalltalk: [self simulatedTrampolineFor: #ceCheckProfileTick]). "reenter the post-primitive call flow" self Jump: continuePostSamplePrim]. "Null newMethod and call ceCheckProfileTick: to record sample and then continue. ceCheckProfileTick will map null/0 to coInterpreter nilObject" jmpSampleNonPrim jmpTarget: self Label. self MoveCq: 0 R: TempReg. self MoveR: TempReg Aw: coInterpreter newMethodAddress. self CallFullRT: (self cCode: [#ceCheckProfileTick asUnsignedLong] inSmalltalk: [self simulatedTrampolineFor: #ceCheckProfileTick]). "reenter the post-primitive call flow" self Jump: continuePostSampleNonPrim]. jmp notNil ifTrue: ["Jump to restore of receiver reg and proceed to frame build for failure." jmp jmpTarget: self Label. "Restore receiver reg from stack. If on RISCs ret pc is in LinkReg, if on CISCs ret pc is on stack." self MoveMw: objectMemory wordSize * (methodOrBlockNumArgs + (backEnd hasLinkRegister ifTrue: [0] ifFalse: [1])) r: SPReg R: ReceiverResultReg]. ^0! Item was changed: ----- Method: SimpleStackBasedCogit>>recordCallOffsetIn: (in category 'external primitive support') ----- recordCallOffsetIn: cogMethod <api> <var: #cogMethod type: #'CogMethod *'> | offset offsetTable | <var: #offsetTable type: #'sqInt *'> offset := primSetFunctionLabel address - cogMethod asInteger. (externalSetPrimOffsets at: cogMethod cmNumArgs) isNil ifTrue: [externalSetPrimOffsets at: cogMethod cmNumArgs put: offset] ifFalse: [self assert: (externalSetPrimOffsets at: cogMethod cmNumArgs) = offset]. + offsetTable := primInvokeInstruction isJump + ifTrue: [externalPrimJumpOffsets] + ifFalse: [externalPrimCallOffsets]. + offset := primInvokeInstruction address + primInvokeInstruction machineCodeSize - cogMethod asInteger. - offsetTable := (backEnd isCallPrecedingReturnPC: primInvokeLabel address asUnsignedInteger) - ifTrue: [externalPrimCallOffsets] - ifFalse: [externalPrimJumpOffsets]. - offset := primInvokeLabel address - cogMethod asInteger. (offsetTable at: cogMethod cmNumArgs) isNil ifTrue: [offsetTable at: cogMethod cmNumArgs put: offset] ifFalse: [self assert: (offsetTable at: cogMethod cmNumArgs) = offset]!

1 0

VM Maker: VMMaker.oscog-eem.1547.mcz
by commits＠source.squeak.org 04 Dec '15

04 Dec '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1547.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1547 Author: eem Time: 3 December 2015, 7:03:52.115 pm UUID: dbc286db-e2dd-47a9-b251-e51a7c123ae2 Ancestors: VMMaker.oscog-eem.1546 x64 Cogit: Fix comparison of pairs of integers for 64-bit Spur. Spur's 3-bit tags imply e.g. xor to check each tag in a pair. =============== Diff against VMMaker.oscog-eem.1546 =============== Item was added: + ----- Method: CogObjectRepresentation>>genJumpNotSmallIntegersIn:andScratchReg: (in category 'compile abstract instructions') ----- + genJumpNotSmallIntegersIn: aRegister andScratchReg: scratchReg + "Generate a compare and branch to test if aRegister and scratchReg contains other than SmallIntegers, + i.e. don't branch if both aRegister and scratchReg contain SmallIntegers. + Answer the jump. Destroy scratchReg if required." + <returnTypeC: #'AbstractInstruction *'> + ^self subclassResponsibility! Item was added: + ----- Method: CogObjectRepresentationFor32BitSpur>>genJumpNotSmallIntegersIn:andScratchReg: (in category 'compile abstract instructions') ----- + genJumpNotSmallIntegersIn: aRegister andScratchReg: scratchReg + "Generate a compare and branch to test if aRegister and scratchReg contains other than SmallIntegers, + i.e. don't branch if both aRegister and scratchReg contain SmallIntegers. + Answer the jump. Destroy scratchReg if required." + <returnTypeC: #'AbstractInstruction *'> + <inline: true> + cogit AndR: aRegister R: scratchReg. + ^self genJumpNotSmallIntegerInScratchReg: scratchReg! Item was added: + ----- Method: CogObjectRepresentationFor64BitSpur>>genJumpNotSmallIntegersIn:andScratchReg: (in category 'compile abstract instructions') ----- + genJumpNotSmallIntegersIn: aRegister andScratchReg: scratchReg + "Generate a compare and branch to test if aRegister and scratchReg contains other than SmallIntegers, + i.e. don't branch if both aRegister and scratchReg contain SmallIntegers. + Answer the jump. Destroy scratchReg if required." + <returnTypeC: #'AbstractInstruction *'> + ^cogit + XorR: aRegister R: scratchReg; + AndCq: self tagMask R: scratchReg; + JumpNonZero: 0! Item was added: + ----- Method: CogObjectRepresentationFor64BitSpur>>tagMask (in category 'accessing') ----- + tagMask + <inline: true> + ^7! Item was added: + ----- Method: CogObjectRepresentationForSqueakV3>>genJumpNotSmallIntegersIn:andScratchReg: (in category 'compile abstract instructions') ----- + genJumpNotSmallIntegersIn: aRegister andScratchReg: scratchReg + "Generate a compare and branch to test if aRegister and scratchReg contains other than SmallIntegers, + i.e. don't branch if both aRegister and scratchReg contain SmallIntegers. + Answer the jump. Destroy scratchReg if required." + <returnTypeC: #'AbstractInstruction *'> + <inline: true> + cogit AndR: aRegister R: scratchReg. + ^self genJumpNotSmallIntegerInScratchReg: scratchReg! Item was changed: ----- Method: SistaStackToRegisterMappingCogit>>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 annotateInst 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. annotateInst := self ssTop annotateUse. 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 andScratchReg: TempReg]. - self MoveR: Arg0Reg R: TempReg. - rcvrIsInt ifFalse: - [objectRepresentation isSmallIntegerTagNonZero - ifTrue: [self AndR: ReceiverResultReg R: TempReg] - ifFalse: [self OrR: ReceiverResultReg R: TempReg]]]. - jumpNotSmallInts := objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg. counterReg := self allocateRegNotConflictingWith: (self registerMaskFor: ReceiverResultReg and: Arg0Reg). self genExecutionCountLogicInto: [ :cAddress :countTripBranch | counterAddress := cAddress. countTripped := countTripBranch ] counterReg: counterReg. argIsInt ifTrue: [annotateInst ifTrue: [self annotateBytecode: (self CmpCq: argInt R: ReceiverResultReg)] ifFalse: [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 changed: ----- Method: StackToRegisterMappingCogit>>genSpecialSelectorArithmetic (in category 'bytecode generators') ----- genSpecialSelectorArithmetic | primDescriptor rcvrIsConst argIsConst rcvrIsInt argIsInt rcvrInt argInt result jumpNotSmallInts jumpContinue annotateInst instToAnnotate index | <var: #primDescriptor type: #'BytecodeDescriptor *'> <var: #jumpNotSmallInts type: #'AbstractInstruction *'> <var: #jumpContinue type: #'AbstractInstruction *'> <var: #instToAnnotate type: #'AbstractInstruction *'> primDescriptor := self generatorAt: byte0. argIsInt := (argIsConst := self ssTop type = SSConstant) and: [objectMemory isIntegerObject: (argInt := self ssTop constant)]. rcvrIsInt := (rcvrIsConst := (self ssValue: 1) type = SSConstant) and: [objectMemory isIntegerObject: (rcvrInt := (self ssValue: 1) constant)]. (argIsInt and: [rcvrIsInt]) ifTrue: [rcvrInt := objectMemory integerValueOf: rcvrInt. argInt := objectMemory integerValueOf: argInt. primDescriptor opcode caseOf: { [AddRR] -> [result := rcvrInt + argInt]. [SubRR] -> [result := rcvrInt - argInt]. [AndRR] -> [result := rcvrInt bitAnd: argInt]. [OrRR] -> [result := rcvrInt bitOr: argInt] }. (objectMemory isIntegerValue: result) ifTrue: ["Must enter any annotatedConstants into the map" self annotateBytecodeIfAnnotated: (self ssValue: 1). self annotateBytecodeIfAnnotated: self ssTop. "Must annotate the bytecode for correct pc mapping." ^self ssPop: 2; ssPushAnnotatedConstant: (objectMemory integerObjectOf: result)]. ^self genSpecialSelectorSend]. "If there's any constant involved other than a SmallInteger don't attempt to inline." ((rcvrIsConst and: [rcvrIsInt not]) or: [argIsConst and: [argIsInt not]]) ifTrue: [^self genSpecialSelectorSend]. "If we know nothing about the types then better not to inline as the inline cache and primitive code is not terribly slow so wasting time on duplicating tag tests is pointless." (argIsInt or: [rcvrIsInt]) ifFalse: [^self genSpecialSelectorSend]. argIsInt ifTrue: [self ssFlushTo: simStackPtr - 2. (self ssValue: 1) popToReg: ReceiverResultReg. annotateInst := self ssTop annotateUse. 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 andScratchReg: TempReg]. - self MoveR: Arg0Reg R: TempReg. - rcvrIsInt ifFalse: - [objectRepresentation isSmallIntegerTagNonZero - ifTrue: [self AndR: ReceiverResultReg R: TempReg] - ifFalse: [self OrR: ReceiverResultReg R: TempReg]]]. - jumpNotSmallInts := objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg. primDescriptor opcode caseOf: { [AddRR] -> [argIsInt ifTrue: [instToAnnotate := self AddCq: argInt - ConstZero R: ReceiverResultReg. jumpContinue := self JumpNoOverflow: 0. "overflow; must undo the damage before continuing" self SubCq: argInt - ConstZero R: ReceiverResultReg] ifFalse: [objectRepresentation genRemoveSmallIntegerTagsInScratchReg: ReceiverResultReg. self AddR: Arg0Reg R: ReceiverResultReg. jumpContinue := self JumpNoOverflow: 0. "overflow; must undo the damage before continuing" rcvrIsInt ifTrue: [self MoveCq: rcvrInt R: ReceiverResultReg] ifFalse: [self SubR: Arg0Reg R: ReceiverResultReg. objectRepresentation genSetSmallIntegerTagsIn: ReceiverResultReg]]]. [SubRR] -> [argIsInt ifTrue: [instToAnnotate := self SubCq: argInt - ConstZero R: ReceiverResultReg. jumpContinue := self JumpNoOverflow: 0. "overflow; must undo the damage before continuing" self AddCq: argInt - ConstZero R: ReceiverResultReg] ifFalse: [objectRepresentation genRemoveSmallIntegerTagsInScratchReg: Arg0Reg. self SubR: Arg0Reg R: ReceiverResultReg. jumpContinue := self JumpNoOverflow: 0. "overflow; must undo the damage before continuing" self AddR: Arg0Reg R: ReceiverResultReg. objectRepresentation genSetSmallIntegerTagsIn: Arg0Reg]]. [AndRR] -> [argIsInt ifTrue: [instToAnnotate := self AndCq: argInt R: ReceiverResultReg] ifFalse: [self AndR: Arg0Reg R: ReceiverResultReg]. jumpContinue := self Jump: 0]. [OrRR] -> [argIsInt ifTrue: [instToAnnotate := self OrCq: argInt R: ReceiverResultReg] ifFalse: [self OrR: Arg0Reg R: ReceiverResultReg]. jumpContinue := self Jump: 0] }. jumpNotSmallInts jmpTarget: self Label. argIsInt ifTrue: [annotateInst ifTrue: [self annotateBytecode: instToAnnotate]. self MoveCq: argInt R: Arg0Reg]. index := byte0 - self firstSpecialSelectorBytecodeOffset. self genMarshalledSend: index negated - 1 numArgs: 1 sendTable: ordinarySendTrampolines. jumpContinue jmpTarget: self Label. ^0! Item was changed: ----- Method: StackToRegisterMappingCogit>>genSpecialSelectorComparison (in category 'bytecode generators') ----- genSpecialSelectorComparison | nextPC postBranchPC targetBytecodePC primDescriptor branchDescriptor rcvrIsInt argIsInt argInt jumpNotSmallInts inlineCAB annotateInst index | <var: #primDescriptor type: #'BytecodeDescriptor *'> <var: #branchDescriptor type: #'BytecodeDescriptor *'> <var: #jumpNotSmallInts type: #'AbstractInstruction *'> 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]. (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. annotateInst := self ssTop annotateUse. 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 andScratchReg: TempReg]. - self MoveR: Arg0Reg R: TempReg. - rcvrIsInt ifFalse: - [objectRepresentation isSmallIntegerTagNonZero - ifTrue: [self AndR: ReceiverResultReg R: TempReg] - ifFalse: [self OrR: ReceiverResultReg R: TempReg]]]. - jumpNotSmallInts := objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg. argIsInt ifTrue: [annotateInst ifTrue: [self annotateBytecode: (self CmpCq: argInt R: ReceiverResultReg)] ifFalse: [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 Jump: (self ensureNonMergeFixupAt: postBranchPC - initialPC). jumpNotSmallInts jmpTarget: self Label. argIsInt ifTrue: [self MoveCq: argInt R: Arg0Reg]. index := byte0 - self firstSpecialSelectorBytecodeOffset. ^self genMarshalledSend: index negated - 1 numArgs: 1 sendTable: ordinarySendTrampolines!

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev December 2015