Vm-dev December 2015

vm-dev@lists.squeakfoundation.org

33 participants
207 discussions

VM Maker: VMMaker.oscog-eem.1546.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.1546.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1546 Author: eem Time: 3 December 2015, 6:33:03.684 pm UUID: c944400d-c93e-49d8-85e7-d060d8585fd3 Ancestors: VMMaker.oscog-eem.1545 x64 cogit: Fix slip in concretizeAndRR. use assert:equals: throughout CogX64CompilerTests =============== Diff against VMMaker.oscog-eem.1545 =============== Item was changed: ----- Method: CogARMCompilerTests>>testAdd (in category 'tests') ----- testAdd "self new testAdd" "the forms are valid, " "test AddCqR" self concreteCompilerClass registersWithNamesDo: [ :reg :regName | #(0 16rF 16rFF) do: [:n| | inst len | inst := self gen: AddCqR operand: n operand: reg. len := inst concretizeAt: 0. self disassembleInstructionAt: 0 In: inst into: [:str :sz| | plainJane herIntended | plainJane := self strip: str. herIntended := 'adds ', regName, ', ', regName, ', #', n asString. + self assert: herIntended equals: plainJane]]]. - self assert: (plainJane match: herIntended)]]]. "test AddCwR" self concreteCompilerClass registersWithNamesDo: [ :reg :regName | #(16rFFFFFFFF 16r88888888 0) do: [:n| | inst len | inst := self gen: AddCwR operand: n operand: reg. len := inst concretizeAt: 0. self disassembleInstructionAt: 0 In: inst into: [:str :sz| | plainJane herIntended | plainJane := self strip: str. herIntended := 'mov ip, #', (n bitAnd: 16rFF << 24) signedIntFromLong asString. + self assert: herIntended equals: plainJane]. - self assert: (plainJane match: herIntended)]. self disassembleInstructionAt: 4 In: inst into: [:str :sz| | plainJane herIntended | plainJane := self strip: str. herIntended := 'orr ip, ip, #', (n bitAnd: 16rFF << 16) asString. + self assert: herIntended equals: plainJane]. - self assert: (plainJane match: herIntended)]. self disassembleInstructionAt: 8 In: inst into: [:str :sz| | plainJane herIntended | plainJane := self strip: str. herIntended := 'orr ip, ip, #', (n bitAnd: 16rFF << 8) signedIntFromLong asString. + self assert: herIntended equals: plainJane]. - self assert: (plainJane match: herIntended)]. self disassembleInstructionAt: 12 In: inst into: [:str :sz| | plainJane herIntended | plainJane := self strip: str. herIntended := 'orr ip, ip, #', (n bitAnd: 16rFF) asString. + self assert: herIntended equals: plainJane]. - self assert: (plainJane match: herIntended)]. self disassembleInstructionAt: 16 In: inst into: [:str :sz| | plainJane herIntended | plainJane := self strip: str. herIntended := 'adds ', regName, ', ', regName, ', ip'. + self assert: herIntended equals: plainJane]]] - self assert: (plainJane match: herIntended)]]] ! Item was changed: ----- Method: CogARMCompilerTests>>testPrefetchAw (in category 'tests') ----- testPrefetchAw "self new testPrefetchAw" #(16rFF00FF00 16r00000012) do: [:n| | inst len | inst := self gen: PrefetchAw operand: n. len := inst concretizeAt: 0. self disassembleInstructionAt: 12 In: inst into: [:str :sz| | plainJane herIntended | "Convert e.g. '00000000: movl %eax, 0x2(%eax) : 89 40 02' to 'movl %eax, 0x2(%eax)'" plainJane := self strip: str. herIntended := 'pld [sl', ((n bitAnd: 16rFF) = 0 ifTrue: [''] ifFalse: [', #', (n bitAnd: 16rFF) asString]) ,']'. + self assert: herIntended equals: plainJane. - self assert: (plainJane match: herIntended). self assert: len = 16]]. ! Item was changed: ----- Method: CogARMCompilerTests>>testPushR (in category 'tests') ----- testPushR "self new testPushR" self concreteCompilerClass registersWithNamesDo: [:r :name | | inst len | inst := self gen: PushR operand: r. len := inst concretizeAt: 0. self disassembleInstructionAt: 0 In: inst into: [:str :sz| | plainJane herIntended | "Convert e.g. '00000000: movl %eax, 0x2(%eax) : 89 40 02' to 'movl %eax, 0x2(%eax)'" plainJane := self strip: str. herIntended := 'push {', name ,'}'. + self assert: herIntended equals: plainJane. - self assert: (plainJane match: herIntended). self assert: len = 4]]. ! Item was changed: ----- Method: CogARMCompilerTests>>testRetN (in category 'tests') ----- testRetN "self new testRetN" #(0) do: [:n| | inst len | inst := self gen: RetN operand: n. len := inst concretizeAt: 0. self disassembleInstructionAt: 0 In: inst into: [:str :sz| | plainJane | "Convert e.g. '00000000: movl %eax, 0x2(%eax) : 89 40 02' to 'movl %eax, 0x2(%eax)'" plainJane := self strip: str. self assert: (plainJane match: 'mov pc, lr'). self assert: len = sz]]. #(1 2 3 4 5 6 7) do: [:n| | inst len | inst := self gen: RetN operand: n * 4. len := inst concretizeAt: 0. self disassembleInstructionAt: 0 In: inst into: [:str :sz| | plainJane herIntended | plainJane := self strip: str. herIntended := 'add sp, sp, #', (n * 4 )asString. + self assert: herIntended equals: plainJane]. - self assert: (plainJane match: herIntended)]. self disassembleInstructionAt: 4 In: inst into: [:str :sz| | plainJane | plainJane := self strip: str. self assert: (plainJane match: 'mov pc, lr'). self assert: len = 8]]! Item was changed: ----- 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! - ^machineCodeSize := 2! Item was changed: ----- Method: CogX64CompilerTests>>testAddCqR (in category 'tests') ----- testAddCqR "self new testAddCqR" self concreteCompilerClass registersWithNamesDo: [:reg :regname| #(16r1 16r3 16r7 16r555555 16rAAAAAA) do: [:const| | inst len| inst := self gen: AddCqR operand: const operand: reg. len := inst concretizeAt: 0. self processor disassembleInstructionAt: 0 In: inst machineCode object into: [:str :sz| | plainJane herIntended | "Convert e.g. '00000000: movl %eax, 0x2(%eax) : 89 40 02' to 'movl %eax, 0x2(%eax)'" plainJane := self strip: str. herIntended := 'addq $0x', (const printStringBase: 16 length: 16 padded: true), ', ', regname. + self assert: herIntended equals: plainJane. - self assert: (plainJane match: herIntended). self assert: len = sz]]]! Item was changed: ----- Method: CogX64CompilerTests>>testAndCqR (in category 'tests') ----- testAndCqR "self new testAndCqR" self concreteCompilerClass registersWithNamesDo: [:reg :regname| #(16r1 16r3 16r7 16r555555 16rAAAAAA) do: [:const| | inst len| inst := self gen: AndCqR operand: const operand: reg. len := inst concretizeAt: 0. self processor disassembleInstructionAt: 0 In: inst machineCode object into: [:str :sz| | plainJane herIntended | "Convert e.g. '00000000: movl %eax, 0x2(%eax) : 89 40 02' to 'movl %eax, 0x2(%eax)'" plainJane := self strip: str. herIntended := 'andq $0x', (const printStringBase: 16 length: 16 padded: true), ', ', regname. + self assert: herIntended equals: plainJane. - self assert: (plainJane match: herIntended). self assert: len = sz]]]! Item was added: + ----- Method: CogX64CompilerTests>>testAndRR (in category 'tests') ----- + testAndRR + "CogX64CompilerTests new testAndRR" + self concreteCompilerClass registersWithNamesDo: + [:sreg :sregname| + self concreteCompilerClass registersWithNamesDo: + [:dreg :dregname| | inst len | + inst := self gen: AndRR operand: sreg operand: dreg. + len := inst concretizeAt: 0. + self processor + disassembleInstructionAt: 0 + In: inst machineCode object + into: [:str :sz| | plainJane herIntended | + "Convert e.g. '00000000: movl %eax, 0x2(%eax) : 89 40 02' to 'movl %eax, 0x2(%eax)'" + plainJane := self strip: str. + herIntended := 'andq ', sregname, ', ', dregname. + self assert: herIntended equals: plainJane. + self assert: len = sz]]]! Item was changed: ----- Method: CogX64CompilerTests>>testCMPXCHGAwR (in category 'tests') ----- testCMPXCHGAwR "self new testCMPXCHGAwR" | cmpxchgAwR | cmpxchgAwR := CogX64Compiler classPool at: #CMPXCHGAwR. self concreteCompilerClass registersWithNamesDo: [:reg :regname| #(16r555555 16rAAAAAA) do: [:addr| | inst len | inst := self gen: cmpxchgAwR operand: addr operand: reg. len := inst concretizeAt: 0. self processor disassembleInstructionAt: 0 In: inst machineCode object into: [:str :sz| | plainJane herIntended | "Convert e.g. '00000000: movl %eax, 0x2(%eax) : 89 40 02' to 'movl %eax, 0x2(%eax)'" plainJane := self strip: str. herIntended := 'cmpxchgl ', regname, ', 0x', (addr hex allButFirst: 3). + self assert: herIntended equals: plainJane. - self assert: (plainJane match: herIntended). self assert: len = sz]]]! Item was changed: ----- Method: CogX64CompilerTests>>testCMPXCHGMwrR (in category 'tests') ----- testCMPXCHGMwrR "self new testCMPXCHGMwrR" | cmpxchgMwrR lock | cmpxchgMwrR := CogX64Compiler classPool at: #CMPXCHGMwrR. lock := CogX64Compiler classPool at: #LOCK. self concreteCompilerClass registersWithNamesDo: [:sreg :srname| self concreteCompilerClass registersWithNamesDo: [:dreg :drname| ((1 to: 19 by: 3) collect: [:po2| 2 raisedToInteger: po2]) do: [:offset| #(false true) do: [:prefixLock| | memory | self resetGen. prefixLock ifTrue: [self gen: lock]. self gen: cmpxchgMwrR operand: offset operand: sreg operand: dreg. memory := self generateInstructions. self processor disassembleInstructionAt: 0 In: memory into: [:str :sz| | plainJane herIntended | plainJane := self strip: str. herIntended := (prefixLock ifTrue: ['lock '] ifFalse: ['']), 'cmpxchgl ', drname, ', 0x', (offset hex allButFirst: 3), '(', srname, ')'. + self assert: herIntended equals: plainJane. - self assert: (plainJane match: herIntended). self assert: memory size = sz]]]]]! Item was changed: ----- Method: CogX64CompilerTests>>testCmpCqR (in category 'tests') ----- testCmpCqR "self new testCmpCqR" self concreteCompilerClass registersWithNamesDo: [:reg :regname| #(16r1 16r3 16r7 16r555555 16rAAAAAA) do: [:const| | inst len| inst := self gen: CmpCqR operand: const operand: reg. len := inst concretizeAt: 0. self processor disassembleInstructionAt: 0 In: inst machineCode object into: [:str :sz| | plainJane herIntended | "Convert e.g. '00000000: movl %eax, 0x2(%eax) : 89 40 02' to 'movl %eax, 0x2(%eax)'" plainJane := self strip: str. herIntended := 'cmpq $0x', (const printStringBase: 16 length: 16 padded: true), ', ', regname. + self assert: herIntended equals: plainJane. - self assert: (plainJane match: herIntended). self assert: len = sz]]]! Item was changed: ----- Method: CogX64CompilerTests>>testMoveAbR (in category 'tests') ----- testMoveAbR "self neb testMoveAbR" self concreteCompilerClass byteRegistersWithNamesDo: [:reg :regname| | reg64name | reg64name := self processor registerStateGetters at: reg + 1. #(16r555555 16rAAAAAA 16r5A5A5A5A5A5A) do: [:addr| | inst len totalsz | inst := self gen: MoveAbR operand: addr operand: reg. len := inst concretizeAt: 0. totalsz := 0. regname ~= '%al' ifTrue: [self processor disassembleInstructionAt: 0 In: inst machineCode object into: [:str :sz| | plainJane herIntended | plainJane := self strip: str. herIntended := 'xchgq %rax, %', reg64name. + self assert: herIntended equals: plainJane. - self assert: (plainJane match: herIntended). totalsz := sz]]. self processor disassembleInstructionAt: totalsz In: inst machineCode object into: [:str :sz| | plainJane herIntended | plainJane := self strip: str. herIntended := 'movb 0x', (addr printStringBase: 16 length: 16 padded: true), ', %al'. + self assert: herIntended equals: plainJane. - self assert: (plainJane match: herIntended). totalsz := totalsz + sz]. regname ~= '%al' ifTrue: [self processor disassembleInstructionAt: totalsz In: inst machineCode object into: [:str :sz| | plainJane herIntended | plainJane := self strip: str. herIntended := 'xchgq %rax, %', reg64name. + self assert: herIntended equals: plainJane. - self assert: (plainJane match: herIntended). totalsz := totalsz + sz]]. self assert: len = totalsz]]! Item was changed: ----- Method: CogX64CompilerTests>>testMoveAwR (in category 'tests') ----- testMoveAwR "self new testMoveAwR" self concreteCompilerClass registersWithNamesDo: [:reg :regname| #(16r555555 16rAAAAAA 16r5A5A5A5A5A5A) do: [:addr| | inst len totalsz | inst := self gen: MoveAwR operand: addr operand: reg. len := inst concretizeAt: 0. totalsz := 0. regname ~= '%rax' ifTrue: [self processor disassembleInstructionAt: 0 In: inst machineCode object into: [:str :sz| | plainJane herIntended | plainJane := self strip: str. herIntended := 'xchgq %rax, ', regname. + self assert: herIntended equals: plainJane. - self assert: (plainJane match: herIntended). totalsz := sz]]. self processor disassembleInstructionAt: totalsz In: inst machineCode object into: [:str :sz| | plainJane herIntended | plainJane := self strip: str. herIntended := 'movq 0x', (addr printStringBase: 16 length: 16 padded: true), ', %rax'. + self assert: herIntended equals: plainJane. - self assert: (plainJane match: herIntended). totalsz := totalsz + sz]. regname ~= '%rax' ifTrue: [self processor disassembleInstructionAt: totalsz In: inst machineCode object into: [:str :sz| | plainJane herIntended | plainJane := self strip: str. herIntended := 'xchgq %rax, ', regname. + self assert: herIntended equals: plainJane. - self assert: (plainJane match: herIntended). totalsz := totalsz + sz]]. self assert: len = totalsz]]! Item was changed: ----- Method: CogX64CompilerTests>>testMoveC32R (in category 'tests') ----- testMoveC32R "self new testMoveMwrR" self concreteCompilerClass registersWithNamesDo: [:reg :rname| #(0 64 65536 -64 -65536) do: [:offset| | inst len | inst := self gen: MoveC32R operand: offset operand: reg. len := inst concretizeAt: 0. self processor disassembleInstructionAt: 0 In: inst machineCode object into: [:str :sz| | plainJane herIntended po | plainJane := self strip: str. po := offset bitAnd: 1 << self processor bitsInWord - 1. herIntended := 'movq $0x', (po printStringBase: 16 length: 16 padded: true), ', ', rname. + self assert: herIntended equals: plainJane. - self assert: (plainJane match: herIntended). self assert: len = sz]]]! Item was changed: ----- Method: CogX64CompilerTests>>testMoveMbrR (in category 'tests') ----- testMoveMbrR "self new testMoveMbrR" self concreteCompilerClass registersWithNamesDo: [:sreg :srname| self concreteCompilerClass byteRegistersWithNamesDo: [:dreg :drname| ((1 to: 19 by: 3) collect: [:po2| 2 raisedToInteger: po2]) do: [:offset| | inst len | inst := self gen: MoveMbrR operand: offset operand: sreg operand: dreg. self deny: inst byteReadsZeroExtend. len := inst concretizeAt: 0. self processor disassembleInstructionAt: 0 In: inst machineCode object into: [:str :sz| | plainJane herIntended po | po := offset bitAnd: 1 << self processor bitsInWord - 1. plainJane := self strip: str. herIntended := 'movb ', (offset = 0 ifTrue: [''] ifFalse: ['0x', (po printStringBase: 16 length: 16 padded: true)]), '(', srname, '), ', drname. + self assert: herIntended equals: plainJane. - self assert: (plainJane match: herIntended). self assert: len = sz]]]]! Item was changed: ----- Method: CogX64CompilerTests>>testMoveMwrR (in category 'tests') ----- testMoveMwrR "self new testMoveMwrR" self concreteCompilerClass registersWithNamesDo: [:sreg :srname| self concreteCompilerClass registersWithNamesDo: [:dreg :drname| | inst len | #(0 64 65536 -64 -65536) do: [:offset| inst := self gen: MoveMwrR operand: offset operand: sreg operand: dreg. len := inst concretizeAt: 0. self processor disassembleInstructionAt: 0 In: inst machineCode object into: [:str :sz| | plainJane herIntended po | plainJane := self strip: str. po := offset bitAnd: 1 << self processor bitsInWord - 1. herIntended := 'movq ', (offset = 0 ifTrue: [''] ifFalse: ['0x', (po printStringBase: 16 length: 16 padded: true)]), '(', srname, '), ', drname. + self assert: herIntended equals: plainJane. - self assert: (plainJane match: herIntended). self assert: len = sz]]]] "| failures | failures := Dictionary new. self concreteCompilerClass registersWithNamesDo: [:sreg :srname| self concreteCompilerClass registersWithNamesDo: [:dreg :drname| | inst len | #(0 64 65536 -64 -65536) do: [:offset| inst := self gen: MoveMwrR operand: offset operand: sreg operand: dreg. len := inst concretizeAt: 0. self processor disassembleInstructionAt: 0 In: inst machineCode object into: [:str :sz| | plainJane herIntended po | plainJane := self strip: str. po := offset bitAnd: 1 << self processor bitsInWord - 1. herIntended := 'movq ', (offset = 0 ifTrue: [''] ifFalse: ['0x', (po printStringBase: 16 length: 16 padded: true)]), '(', srname, '), ', drname. ((plainJane match: herIntended) and: [len = sz]) ifFalse: [failures at: herIntended put: plainJane]]]]]. failures"! Item was changed: ----- Method: CogX64CompilerTests>>testMoveRAb (in category 'tests') ----- testMoveRAb "self new testMoveRAb" self concreteCompilerClass byteRegistersWithNamesDo: [:reg :regname| | reg64name | reg64name := self processor registerStateGetters at: reg + 1. #(16r555555 16rAAAAAA 16r5A5A5A5A5A5A) do: [:addr| | inst len totalsz | inst := self gen: MoveRAb operand: reg operand: addr. len := inst concretizeAt: 0. totalsz := 0. regname ~= '%al' ifTrue: [self processor disassembleInstructionAt: 0 In: inst machineCode object into: [:str :sz| | plainJane herIntended | plainJane := self strip: str. herIntended := 'xchgq %rax, %', reg64name. + self assert: herIntended equals: plainJane. - self assert: (plainJane match: herIntended). totalsz := sz]]. self processor disassembleInstructionAt: totalsz In: inst machineCode object into: [:str :sz| | plainJane herIntended | plainJane := self strip: str. herIntended := 'movb %al, 0x', (addr printStringBase: 16 length: 16 padded: true). + self assert: herIntended equals: plainJane. - self assert: (plainJane match: herIntended). totalsz := totalsz + sz]. regname ~= '%al' ifTrue: [self processor disassembleInstructionAt: totalsz In: inst machineCode object into: [:str :sz| | plainJane herIntended | plainJane := self strip: str. herIntended := 'xchgq %rax, %', reg64name. + self assert: herIntended equals: plainJane. - self assert: (plainJane match: herIntended). totalsz := totalsz + sz]]. self assert: len = totalsz]]! Item was changed: ----- Method: CogX64CompilerTests>>testMoveRAw (in category 'tests') ----- testMoveRAw "self new testMoveRAw" self concreteCompilerClass registersWithNamesDo: [:reg :regname| #(16r555555 16rAAAAAA 16r5A5A5A5A5A5A) do: [:addr| | inst len totalsz | inst := self gen: MoveRAw operand: reg operand: addr. len := inst concretizeAt: 0. totalsz := 0. regname ~= '%rax' ifTrue: [self processor disassembleInstructionAt: 0 In: inst machineCode object into: [:str :sz| | plainJane herIntended | plainJane := self strip: str. herIntended := 'xchgq %rax, ', regname. + self assert: herIntended equals: plainJane. - self assert: (plainJane match: herIntended). totalsz := sz]]. self processor disassembleInstructionAt: totalsz In: inst machineCode object into: [:str :sz| | plainJane herIntended | plainJane := self strip: str. herIntended := 'movq %rax, 0x', (addr printStringBase: 16 length: 16 padded: true). + self assert: herIntended equals: plainJane. - self assert: (plainJane match: herIntended). totalsz := totalsz + sz]. regname ~= '%rax' ifTrue: [self processor disassembleInstructionAt: totalsz In: inst machineCode object into: [:str :sz| | plainJane herIntended | plainJane := self strip: str. herIntended := 'xchgq %rax, ', regname. + self assert: herIntended equals: plainJane. - self assert: (plainJane match: herIntended). totalsz := totalsz + sz]]. self assert: len = totalsz]]! Item was changed: ----- Method: CogX64CompilerTests>>testMoveRMbr (in category 'tests') ----- testMoveRMbr "self new testMoveRMbr" self concreteCompilerClass byteRegistersWithNamesDo: [:sreg :srname| self concreteCompilerClass registersWithNamesDo: [:dreg :drname| ((1 to: 19 by: 3) collect: [:po2| 2 raisedToInteger: po2]) do: [:offset| | inst len | inst := self gen: MoveRMbr operand: sreg operand: offset operand: dreg. len := inst concretizeAt: 0. self processor disassembleInstructionAt: 0 In: inst machineCode object into: [:str :sz| | plainJane herIntended po | plainJane := self strip: str. po := offset bitAnd: 1 << self processor bitsInWord - 1. herIntended := 'movb ', srname, (offset = 0 ifTrue: [', '] ifFalse: [', 0x', (po printStringBase: 16 length: 16 padded: true)]), '(', drname, ')'. + self assert: herIntended equals: plainJane. - self assert: (plainJane match: herIntended). self assert: len = sz]]]]! Item was changed: ----- Method: CogX64CompilerTests>>testMoveRMwr (in category 'tests') ----- testMoveRMwr "self new testMoveRMwr" self concreteCompilerClass registersWithNamesDo: [:sreg :srname| self concreteCompilerClass registersWithNamesDo: [:dreg :drname| | inst len | #(0 64 65536 -64 -65536) do: [:offset| inst := self gen: MoveRMwr operand: sreg operand: offset operand: dreg. len := inst concretizeAt: 0. self processor disassembleInstructionAt: 0 In: inst machineCode object into: [:str :sz| | plainJane herIntended po | "Convert e.g. '00000000: movq %rax, 0x2(%rax) : 48 89 40 02' to 'movl %rax, 0x2(%rax)'" plainJane := self strip: str. po := offset bitAnd: 1 << self processor bitsInWord - 1. herIntended := 'movq ', srname, ', ', (offset = 0 ifTrue: [''] ifFalse: ['0x', (po printStringBase: 16 length: 16 padded: true)]), '(',drname,')'. + self assert: herIntended equals: plainJane. - self assert: (plainJane match: herIntended). self assert: len = sz]]]] "| failures | failures := Dictionary new. self concreteCompilerClass registersWithNamesDo: [:sreg :srname| self concreteCompilerClass registersWithNamesDo: [:dreg :drname| | inst len | #(0 64 65536 -64 -65536) do: [:offset| inst := self gen: MoveRMwr operand: sreg operand: offset operand: dreg. len := inst concretizeAt: 0. self processor disassembleInstructionAt: 0 In: inst machineCode object into: [:str :sz| | plainJane herIntended po | plainJane := self strip: str. po := offset bitAnd: 1 << self processor bitsInWord - 1. herIntended := 'movq ', srname, ', ', (offset = 0 ifTrue: [''] ifFalse: ['0x', (po printStringBase: 16 length: 16 padded: true)]), '(',drname,')'. ((plainJane match: herIntended) and: [len = sz]) ifFalse: [failures at: herIntended put: plainJane]]]]]. failures"! Item was changed: ----- Method: CogX64CompilerTests>>testMoveRXwrR (in category 'tests') ----- testMoveRXwrR "self new testMoveXwrRR" self concreteCompilerClass registersWithNamesDo: [:idxreg :irname| irname ~= '%rsp' ifTrue: [self concreteCompilerClass registersWithNamesDo: [:basereg :brname| self concreteCompilerClass registersWithNamesDo: [:sreg :srname| ((1 to: 19 by: 3) collect: [:po2| 2 raisedToInteger: po2]) do: [:offset| | inst len | inst := self gen: MoveRXwrR operand: sreg operand: idxreg operand: basereg. len := inst concretizeAt: 0. self processor disassembleInstructionAt: 0 In: inst machineCode object into: [:str :sz| | plainJane herIntended | "Convert e.g. '00000000: movl %eax, 0x2(%eax) : 89 40 02' to 'movl %eax, 0x2(%eax)'" plainJane := self strip: str. herIntended := 'movq ', srname, ', (', brname, ',', irname, ',8)'. + self assert: herIntended equals: plainJane. - self assert: (plainJane match: herIntended). self assert: len = sz]]]]]]! Item was changed: ----- Method: CogX64CompilerTests>>testMoveRdM64r (in category 'tests') ----- testMoveRdM64r "self new testMoveRdM64r" self concreteCompilerClass xmmRegistersWithNamesDo: [:sreg :srname| self concreteCompilerClass registersWithNamesDo: [:dreg :drname| ((1 to: 19 by: 3) collect: [:po2| 2 raisedToInteger: po2]) do: [:offset| | inst len | inst := self gen: MoveRdM64r operand: sreg operand: offset operand: dreg. len := inst concretizeAt: 0. self processor disassembleInstructionAt: 0 In: inst machineCode object into: [:str :sz| | plainJane herIntended | plainJane := self strip: str. herIntended := 'movsd ', srname, ', 0x', (offset hex allButFirst: 3), '(', drname, ')'. + self assert: herIntended equals: plainJane. - self assert: (plainJane match: herIntended). self assert: len = sz]]]]! Item was changed: ----- Method: CogX64CompilerTests>>testMoveX32rRR (in category 'tests') ----- testMoveX32rRR "self new testMoveX32rRR" self concreteCompilerClass registersWithNamesDo: [:idxreg :irname| irname ~= '%rsp' ifTrue: [self concreteCompilerClass registersWithNamesDo: [:basereg :brname| self concreteCompilerClass doubleWordRegistersWithNamesDo: [:dreg :drname| ((1 to: 19 by: 3) collect: [:po2| 2 raisedToInteger: po2]) do: [:offset| | inst len | inst := self gen: MoveX32rRR operand: idxreg operand: basereg operand: dreg. len := inst concretizeAt: 0. self processor disassembleInstructionAt: 3 In: inst machineCode object into: [:str :sz| | plainJane herIntended | "Convert e.g. '00000000: movl %eax, 0x2(%eax) : 89 40 02' to 'movl %eax, 0x2(%eax)'" plainJane := self strip: str. herIntended := 'movl (', brname, ',', irname, ',4), ',drname. + self assert: herIntended equals: plainJane. - self assert: (plainJane match: herIntended). self assert: len - 3 = sz]]]]]]! Item was changed: ----- Method: CogX64CompilerTests>>testMoveXbrRR (in category 'tests') ----- testMoveXbrRR "self new testMoveXbrRR" self concreteCompilerClass registersWithNamesDo: [:idxreg :irname| irname ~= '%rsp' ifTrue: [self concreteCompilerClass registersWithNamesDo: [:basereg :brname| self concreteCompilerClass byteRegistersWithNamesDo: [:dreg :drname| ((1 to: 19 by: 3) collect: [:po2| 2 raisedToInteger: po2]) do: [:offset| | inst len | inst := self gen: MoveXbrRR operand: idxreg operand: basereg operand: dreg. self deny: inst byteReadsZeroExtend. len := inst concretizeAt: 0. self processor disassembleInstructionAt: 0 In: inst machineCode object into: [:str :sz| | plainJane herIntended | "Convert e.g. '00000000: movzbq %ds:(%rax,%rax,1), %rax : 48 0F B6 04 00 ' to 'movzbq (%rax,%rax,1), %rax'" plainJane := self strip: str. herIntended := 'movb (', brname, ',', irname, ',1), ',drname. + self assert: herIntended equals: plainJane. - self assert: (plainJane match: herIntended). self assert: len = sz]]]]]]! Item was changed: ----- Method: CogX64CompilerTests>>testMoveXwrRR (in category 'tests') ----- testMoveXwrRR "self new testMoveXwrRR" self concreteCompilerClass registersWithNamesDo: [:idxreg :irname| irname ~= '%rsp' ifTrue: [self concreteCompilerClass registersWithNamesDo: [:basereg :brname| self concreteCompilerClass registersWithNamesDo: [:dreg :drname| ((1 to: 19 by: 3) collect: [:po2| 2 raisedToInteger: po2]) do: [:offset| | inst len | inst := self gen: MoveXwrRR operand: idxreg operand: basereg operand: dreg. len := inst concretizeAt: 0. self processor disassembleInstructionAt: 0 In: inst machineCode object into: [:str :sz| | plainJane herIntended | "Convert e.g. '00000000: movl %eax, 0x2(%eax) : 89 40 02' to 'movl %eax, 0x2(%eax)'" plainJane := self strip: str. herIntended := 'movq (', brname, ',', irname, ',8), ',drname. + self assert: herIntended equals: plainJane. - self assert: (plainJane match: herIntended). self assert: len = sz]]]]]]! Item was changed: ----- Method: CogX64CompilerTests>>testOrCqR (in category 'tests') ----- testOrCqR "self new testOrCqR" self concreteCompilerClass registersWithNamesDo: [:reg :regname| #(16r1 16r3 16r7 16r555555 16rAAAAAA) do: [:const| | inst len| inst := self gen: OrCqR operand: const operand: reg. len := inst concretizeAt: 0. self processor disassembleInstructionAt: 0 In: inst machineCode object into: [:str :sz| | plainJane herIntended | "Convert e.g. '00000000: movl %eax, 0x2(%eax) : 89 40 02' to 'movl %eax, 0x2(%eax)'" plainJane := self strip: str. herIntended := 'orq $0x', (const printStringBase: 16 length: 16 padded: true), ', ', regname. + self assert: herIntended equals: plainJane. - self assert: (plainJane match: herIntended). self assert: len = sz]]]! Item was changed: ----- Method: CogX64CompilerTests>>testSubCqR (in category 'tests') ----- testSubCqR "self new testSubCqR" self concreteCompilerClass registersWithNamesDo: [:reg :regname| #(16r1 16r3 16r7 16r555555 16rAAAAAA) do: [:const| | inst len| inst := self gen: SubCqR operand: const operand: reg. len := inst concretizeAt: 0. self processor disassembleInstructionAt: 0 In: inst machineCode object into: [:str :sz| | plainJane herIntended | "Convert e.g. '00000000: movl %eax, 0x2(%eax) : 89 40 02' to 'movl %eax, 0x2(%eax)'" plainJane := self strip: str. herIntended := 'subq $0x', (const printStringBase: 16 length: 16 padded: true), ', ', regname. + self assert: herIntended equals: plainJane. - self assert: (plainJane match: herIntended). self assert: len = sz]]]! Item was changed: ----- Method: CogX64CompilerTests>>testTstCqR (in category 'tests') ----- testTstCqR "self new testTstCqR" self concreteCompilerClass registersWithNamesDo: [:reg :theRegname| #(16r1 16r3 16r7 16r555555 16rAAAAAA) do: [:const| | op regname inst len constString| inst := self gen: TstCqR operand: const operand: reg. len := inst concretizeAt: 0. (inst isQuick: const) ifTrue: [op := 'testb'. regname := reg < 8 ifTrue: [#('%al' '%cl' '%dl' '%bl' '%spl' '%bpl' '%sil' '%dil') at: reg + 1] ifFalse: [theRegname, 'b']. constString := const printStringBase: 16 length: 2 padded: true] ifFalse: [op := 'testq'. regname := theRegname. constString := const printStringBase: 16 length: 16 padded: true]. self processor disassembleInstructionAt: 0 In: inst machineCode object into: [:str :sz| | plainJane herIntended | "Convert e.g. '00000000: movl %eax, 0x2(%eax) : 89 40 02' to 'movl %eax, 0x2(%eax)'" plainJane := self strip: str. herIntended := op, ' $0x', constString, ', ', regname. + self assert: herIntended equals: plainJane. - self assert: (plainJane match: herIntended). self assert: len = sz]]]! Item was changed: ----- Method: CogX64CompilerTests>>testXCHGAwR (in category 'tests') ----- testXCHGAwR "self new testXCHGAwR" | xchgAwR | xchgAwR := CogX64Compiler classPool at: #XCHGAwR. self concreteCompilerClass registersWithNamesDo: [:reg :regname| #(16r555555 16rAAAAAA) do: [:addr| | inst len | inst := self gen: xchgAwR operand: addr operand: reg. len := inst concretizeAt: 0. self processor disassembleInstructionAt: 0 In: inst machineCode object into: [:str :sz| | plainJane herIntended | "Convert e.g. '00000000: movl %eax, 0x2(%eax) : 89 40 02' to 'movl %eax, 0x2(%eax)'" plainJane := self strip: str. herIntended := 'xchgl ', regname, ', 0x', (addr hex allButFirst: 3). + self assert: herIntended equals: plainJane. - self assert: (plainJane match: herIntended). self assert: len = sz]]]! Item was changed: ----- Method: CogX64CompilerTests>>testXCHGMwrR (in category 'tests') ----- testXCHGMwrR "self new testXCHGMwrR" | xchgMwrR | xchgMwrR := CogX64Compiler classPool at: #XCHGMwrR. self concreteCompilerClass registersWithNamesDo: [:sreg :srname| self concreteCompilerClass registersWithNamesDo: [:dreg :drname| ((1 to: 19 by: 3) collect: [:po2| 2 raisedToInteger: po2]) do: [:offset| | memory | self resetGen. self gen: xchgMwrR operand: offset operand: sreg operand: dreg. memory := self generateInstructions. self processor disassembleInstructionAt: 0 In: memory into: [:str :sz| | plainJane herIntended | plainJane := self strip: str. herIntended := 'xchgl ', drname, ', 0x', (offset hex allButFirst: 3), '(', srname, ')'. + self assert: herIntended equals: plainJane. - self assert: (plainJane match: herIntended). self assert: memory size = sz]]]]!

1 0

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

04 Dec '15

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.303.mcz ==================== Summary ==================== Name: Cog-eem.303 Author: eem Time: 3 December 2015, 6:31:36.683 pm UUID: 5537c320-9606-4fd8-bc85-d65e39c43650 Ancestors: Cog-eem.302 Execution failure handlers for x64 MovEbGb & MovEvGv. =============== Diff against Cog-eem.302 =============== Item was changed: ----- Method: BochsX64Alien>>handleMovEbGbFailureAt:in:rex: (in category 'error handling') ----- handleMovEbGbFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" rex: rexByteOrNil "<Integer|nil>" "Convert an execution primitive failure for a byte register write into a ProcessorSimulationTrap signal." + | modrmByte offset size | + modrmByte := memoryArray byteAt: pc + 3. + (modrmByte bitAnd: 16rC0) caseOf: { + [16r80 "ModRegRegDisp32"] -> [offset := memoryArray unsignedLongAt: pc + 4 bigEndian: false. + size := 7]. + [16r40 "ModRegRegDisp8"] -> [offset := memoryArray byteAt: pc + 4. + offset > 127 ifTrue: [offset := offset - 256]. + size := 4] } + otherwise: [self reportPrimitiveFailure]. + ^(ProcessorSimulationTrap + pc: pc + nextpc: pc + size + address: (((self perform: (self registerStateGetters at: (modrmByte bitAnd: 7) + ((rexByteOrNil bitAnd: 1) bitShift: 3) + 1)) + + offset) + bitAnd: 16rFFFFFFFFFFFFFFFF) + type: #write + accessor: (#(al cl dl bl spl bpl sil dil r8l r9l r10l r11l r12l r13l r14l r15l) at: ((modrmByte >> 3 bitAnd: 7) + ((rexByteOrNil bitAnd: 4) bitShift: 1) + 1))) + signal! - | modrmByte | - self shouldBeImplemented. - ^(((modrmByte := memoryArray byteAt: pc + 2) bitAnd: 16rC0) = 16r80) "ModRegRegDisp32" - ifTrue: - [(ProcessorSimulationTrap - pc: pc - nextpc: pc + 6 - address: ((self perform: (#(eax ecx edx ebx esp ebp esi edi) at: (modrmByte bitAnd: 7) + 1)) - + (memoryArray unsignedLongAt: pc + 3 bigEndian: false) - bitAnd: 16rFFFFFFFF) - type: #write - accessor: (#(al cl dl bl ah ch dh bh) at: ((modrmByte >> 3 bitAnd: 7) + 1))) - signal] - ifFalse: - [self reportPrimitiveFailure]! Item was changed: ----- Method: BochsX64Alien>>handleMovEvGvFailureAt:in:rex: (in category 'error handling') ----- handleMovEvGvFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" rex: rexByteOrNil "<Integer|nil>" "Convert an execution primitive failure for a register write into a ProcessorSimulationTrap signal." | modrmByte getter base offset | self assert: rexByteOrNil notNil. modrmByte := memoryArray byteAt: pc + 3. getter := self registerStateGetters at: ((modrmByte >> 3 bitAnd: 7) + ((rexByteOrNil bitAnd: 4) << 1) + 1). (modrmByte bitAnd: 16rC7) = 16r5 ifTrue: "ModRegInd & disp32" [^(ProcessorSimulationTrap pc: pc nextpc: pc + 7 address: (memoryArray unsignedLongAt: pc + 4 bigEndian: false) type: #write accessor: getter) signal]. + (modrmByte bitAnd: 16rC0) = 16r80 ifTrue: "ModRegRegDisp32" - (modrmByte bitAnd: 16rC0) = 16r80 ifTrue: "ModRegRegDisp8" [offset := memoryArray longAt: pc + 4 bigEndian: false. base := self registerStateGetters at: ((modrmByte bitAnd: 7) + ((rexByteOrNil bitAnd: 1) << 3) + 1). ^(ProcessorSimulationTrap pc: pc nextpc: pc + 7 address: (self perform: base) + offset type: #write accessor: getter) signal]. + (modrmByte bitAnd: 16rC0) = 16r40 ifTrue: "ModRegRegDisp8" + [offset := memoryArray unsignedByteAt: pc + 4. + offset > 127 ifTrue: [offset := offset - 256]. + base := self registerStateGetters at: ((modrmByte bitAnd: 7) + ((rexByteOrNil bitAnd: 1) << 3) + 1). + ^(ProcessorSimulationTrap + pc: pc + nextpc: pc + 4 + address: (self perform: base) + offset + type: #write + accessor: getter) + signal]. ^self reportPrimitiveFailure!

1 0

Re: [Pharo-dev] Random forest in Pharo
by Robert Withers 04 Dec '15

04 Dec '15

(+vm-dev) Esteban, thanks very much for your views. You write: On 10/16/2015 07:53 AM, Esteban Lorenzano wrote: > > So… my plan is: > > - NB to FFI port (should be ready soon) > - spur32 bits (should be ready soon, we are just waiting the NB to FFI) > - spur64 bits (Eliot is working on the JIT, I need to manage the migration of Pharo) > - FFI 64bits (0% done here… just some stubs waiting for effort). But we want to move Pharo to 64bits… we are losing a train here... > - FFI MT and of course you are buried in existing tasks, especially the transition to 64-bits. It is my humble opinion, without really knowing, that 64-bit would have to be redone after the MTVM completes. Kinda why I would desire MTVM before 64-bits, then I assume less work would be needed overall. But that's my uneducated guess. Perhaps Eliot could shine some light for us on the progress of MTVM and what's needed. Because of that assumption I've made and without the responsibilities you have, Esteban, but recognizing modernizing NB to FFI, my desired list is: - NB to FFI port (should be ready soon) - spur32 bits (should be ready soon, we are just waiting the NB to FFI) - FFI MT - spur64 bits (Eliot is working on the JIT, I need to manage the migration of Pharo) - FFI 64bits (0% done here… just some stubs waiting for effort). But we want to move Pharo to 64bits… we are losing a train here... > If *anyone* wants to collaborate in any part of this list (is a MASSIVE effort), I would be very happy and willing to provide as much assistance/guiding/peer programming as I can. Yes, please, and I appreciate you willingness to mentor. Best, Robert On 10/16/2015 07:53 AM, Esteban Lorenzano wrote: > >> On 16 Oct 2015, at 13:22, Robert Withers <robert.w.withers(a)gmail.com> wrote: >> >> Bonjour Stef, >> >> I believe the change everyone would be waiting for is a Multi-threaded VM, that supports threaded callouts and callbacks. So I suppose the questions become: > > multi thread ffi vm exists as a prototype, and according to its author (Eliot) needs no less than 4 months of someone skilled working on it to finish it. > >> - will existing NB syntax require change with the introduction of a MTVM? > > nothing will be equal… why? because you will need to provide callbacks. There is no magic here, if you want something to happen while doing something else, you need to provide a way to be called back when that thing finishes. > > now we have: > > nbCall:module: > > to call FFI (will change to a more generic ffiCall:module:, btw… but we’ll keep old notation some versions to provide backward compatibility) > > So I can imagine an API like this: > > ffiAsyncCall:callback:module: > > So yes… you need change. But that’s inevitable… Of course you can do a fwk forking in image and starting a continuation, etc. But well, I will let you guys to think on that (also you still will need the fork) :) > >> - to what degree will NB syntax need to be extended to support threaded callouts. > > as described, I suppose. No exact idea until we implement. > >> - what NB syntax changes are needed for callbacks. > > NB used some magic there. Shadow classes and etc. We do not need/want that anymore. > > now you have a new FFICallback api, where you can do: > > FFICallback > signature: #(int (int handle, int *pitch, int x, int y, int w, int h)) > block: [ :handle :pitch :x :y :w :h | > pitch signedLongAt: 1 put: (self get_stride: handle). > self get_data: handle ] > > (I extracted that example from my ongoing port of Athens) > >> - timing: when is MTVM expected and can we operate on the leading edge? > > we are lacking resources: Is just me (in the Pharo part, of course… Eliot and some others work also in the exclusively VM part, but they have other agendas). > > So… my plan is: > > - NB to FFI port (should be ready soon) > - spur32 bits (should be ready soon, we are just waiting the NB to FFI) > - spur64 bits (Eliot is working on the JIT, I need to manage the migration of Pharo) > - FFI 64bits (0% done here… just some stubs waiting for effort). But we want to move Pharo to 64bits… we are losing a train here... > - FFI MT > > So… not very hight priority. According as how I see things now, I *think* I can have that some point of 2017… yes, as far as that. Also because I have a lot other stuff to do, not just the lowlevel parts. > > Of course this is not good and we have talked with some people to speed up this. We talked with Igor about taking the MT stuff (yes, we also believe is VERY important), but he fade in the blur… I didn’t hear from him since 3 months (I’m still waiting for some feedback on OSWindow work he did, he)… yes I’m a bit frustrated. > > If *anyone* wants to collaborate in any part of this list (is a MASSIVE effort), I would be very happy and willing to provide as much assistance/guiding/peer programming as I can. > > hope this helps > > Esteban > >> >> Personally, in SqueakElib, I have my network and session layers working for encrypted connections, so I just have the presentation layer to go. Once done, I would be very interested in working in the VM with whomever is also interested with an eye towards threading (MTVM). I am no expert here so it will be a challenge I am looking forward to. >> >> Regards, >> Robert >> >> On 10/16/2015 06:59 AM, stepharo wrote: >>> >>> In pharodays presentations we explictly mentioned our strategy: >>> - we keep NB syntax >>> - we change the assembly generation to be able to get Spur. >>> >>> Stef >>> >>> I can tell you that if I could get a lua kind of jit now I would sign >>> immediately and also for having pharo as a dll. >>> Now it takes time to do soemthing. >>> >>> Le 15/10/15 17:35, Robert Withers a écrit : >>>> >>>> I am reticent to invest in learning FFI that is changing without an idea >>>> of the direction of the change. So >>> >>> >> > >

10 20

Squeak3D plugin code generation broken by latest update
by David T. Lewis 04 Dec '15

04 Dec '15

Hi Tim, The latest update in Balloon3D-Plugins-tpr.9 breaks code generation for VMM trunk. A fixed version is attached. This keeps your changes for #inferTypesForImplicitlyTypedVariablesAndMethods and #pruneUnusedInterpreterPluginMethodsIn: but reverts the change that removed B3DEnginePlugin from the classes being added to the code generator (I am not sure if that was just a mistake or if there is something different about how the code generator is being assembled on oscog). I can confirm that this works again on VMM trunk but I can't easily check it on oscog right now. Can you please review and commit back to the Balloon3D repository as needed (I don't have write access). Note, there is a monitor job at http://build.squeak.org/job/InterpreterVM/ that should turn green again once this update is done. Thanks, Dave

2 6

VM Maker: VMMaker.oscog-eem.1545.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.1545.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1545 Author: eem Time: 3 December 2015, 3:22:11.903 pm UUID: 4d01d362-c534-495a-979b-c549f7b5541a Ancestors: VMMaker.oscog-eem.1544, VMMaker.oscog-tpr.1544 Fix setting of expected stack alignment; fp & sp alignments must be mod stack alignment. This fixes stack alignment checking on x64 when PostBuildStackDelta is incuded. Fix genPrimitiveClosureValue for 64-bits (use genJumpImmediate: to exclude non-cogged methods). Add AndRR for x64 and enable multiplication. Sim: include rump C stack in whereIs: ranges. =============== Diff against VMMaker.oscog-eem.1544 =============== Item was changed: ----- Method: CoInterpreter>>whereIs: (in category 'debug printing') ----- whereIs: anOop <var: 'somewhere' type: #'char *'> (cogit whereIsMaybeCodeThing: anOop) ifNotNil: [:somewhere| ^somewhere]. + (self isOnRumpCStack: anOop) ifTrue: [^'is on rump C stack']. ^super whereIs: anOop! Item was added: + ----- 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 := 2! Item was changed: ----- Method: CogX64CompilerTests>>testMul (in category 'tests') ----- testMul "CogX64CompilerTests new setUp testMul" | map compiler memory | map := Dictionary new. compiler := self gen: nil. memory := ByteArray new: 1024. self concreteCompilerClass dataRegistersWithAccessorsExcept: #(rbp rsp) do: [:sreg :srget :srset| self concreteCompilerClass dataRegistersWithAccessorsExcept: { #rbp. #rsp. srget } do: [:dreg :drget :drset| | instructions | self resetGen. compiler genMulR: sreg R: dreg. instructions := self generateInstructions. memory atAllPut: 0; replaceFrom: 1 to: instructions size with: instructions startingAt: 1. #(-768 -456 -123 123 456 789) with: #(987 654 321 -321 -654 -987) do: [:a :b| "self processor disassembleFrom: 0 to: instructions size in: memory on: Transcript; printIntegerRegistersOn: Transcript." map + at: #rax put: (self processor rax: 16rA5A5A5A5); + at: #rbx put: (self processor rbx: 16rB5B5B5B5); + at: #rcx put: (self processor rcx: 16rC5C5C5C5); + at: #rdx put: (self processor rdx: 16rD5D5D5D5); + at: #rsi put: (self processor rsi: 16r51515151); + at: #rdi put: (self processor rdi: 16rD1D1D1D1); - at: #eax put: (self processor eax: 16rA5A5A5A5); - at: #ebx put: (self processor ebx: 16rB5B5B5B5); - at: #ecx put: (self processor ecx: 16rC5C5C5C5); - at: #edx put: (self processor edx: 16rD5D5D5D5); - at: #esi put: (self processor esi: 16r51515151); - at: #edi put: (self processor edi: 16rD1D1D1D1); at: srget put: (self processor perform: srset with: (self processor convertIntegerToInternal: b)); at: drget put: (self processor perform: drset with: (self processor convertIntegerToInternal: a)). + self processor rsp: memory size; rip: 0. - self processor esp: memory size; eip: 0. self shouldnt: [[self processor pc < instructions size] whileTrue: [self processor singleStepIn: memory]] raise: Error. map at: drget put: (self processor convertIntegerToInternal: (a * b)). map keysAndValuesDo: [:accessor :value| self assert: value = (self processor perform: accessor)]]]]! Item was changed: ----- Method: Cogit>>setStackAlignment:expectedSPOffset:expectedFPOffset: (in category 'initialization') ----- setStackAlignment: stackAlignment expectedSPOffset: spOffset expectedFPOffset: fpOffset + "Spcific platform ABIs mandate specific stack frame alignments. We capture + these constraints in the variables here and test they are adhered to via + assertCStackWellAligned whenever transitioning to code that will run in C." - "the processor wants certain stack alignment settings" self assert: stackAlignment isPowerOfTwo. + expectedSPAlignment := spOffset \\ stackAlignment. + expectedFPAlignment := fpOffset \\ stackAlignment. - expectedSPAlignment := spOffset. - expectedFPAlignment := fpOffset. cStackAlignment := stackAlignment ! Item was changed: ----- Method: InterpreterPlugin class>>allCodeOlderThan: (in category 'translation') ----- allCodeOlderThan: modificationTime + ^((self pluginClassesUpToRoot) allSatisfy: - ^((self pluginClassesUpTo: self) allSatisfy: [:aPluginClass| aPluginClass timeStamp < modificationTime]) and: [self translatedPrimitives allSatisfy: [:pair| | c m stamp | c := Smalltalk classNamed: pair first. m := c compiledMethodAt: pair last ifAbsent: [c class >> pair last]. stamp := (m timeStamp subStrings: {Character space}) last: 2. stamp := TimeStamp date: (Date fromString: stamp first) time: (Time fromString: stamp last). stamp asSeconds < modificationTime]]! Item was added: + ----- Method: InterpreterPlugin class>>buildCodeGenerator (in category 'translation') ----- + buildCodeGenerator + "Build a CCodeGenerator for the plugin" + | cg pluginClasses | + cg := self codeGeneratorClass new initialize. + cg pluginClass: self. + (pluginClasses := self pluginClassesUpToRoot) do: + [:aClass| cg addClass: aClass]. + (cg structClassesForTranslationClasses: pluginClasses) do: + [:structClasss| cg addStructClass: structClasss]. + cg addMethodsForTranslatedPrimitives: self translatedPrimitives. + ^cg! Item was changed: ----- Method: InterpreterPlugin class>>buildCodeGeneratorUpTo: (in category 'translation') ----- buildCodeGeneratorUpTo: aPluginClass + "Build a CCodeGenerator for the plugin - Deprecated and here only in case old plugin code tries to use it" + self deprecated. + ^self buildCodeGenerator! - "Build a CCodeGenerator for the plugin" - | cg pluginClasses | - cg := self codeGeneratorClass new initialize. - cg pluginClass: self. - (pluginClasses := self pluginClassesUpTo: aPluginClass) do: - [:aClass| cg addClass: aClass]. - (cg structClassesForTranslationClasses: pluginClasses) do: - [:structClasss| cg addStructClass: structClasss]. - cg addMethodsForTranslatedPrimitives: self translatedPrimitives. - ^cg! Item was added: + ----- Method: InterpreterPlugin class>>moduleFileName (in category 'translation') ----- + moduleFileName + "Answer the receiver's module name that is used for the plugin's C code." + + ^ self moduleName, self moduleExtension! Item was removed: - ----- Method: InterpreterPlugin class>>pluginClassesUpTo: (in category 'translation') ----- - pluginClassesUpTo: aPluginClass - "Answer the classes to include for translation of aPluginClass, superclasses first, aPluginClass last." - | theClass classes | - - classes := OrderedCollection new. - theClass := self. - [theClass == Object - or: [theClass == VMClass]] whileFalse: - [classes addLast: theClass. - theClass := theClass superclass]. - ^classes reverse! Item was added: + ----- Method: InterpreterPlugin class>>pluginClassesUpToRoot (in category 'translation') ----- + pluginClassesUpToRoot + "Answer the classes to include for translation of aPluginClass, superclasses first, and the root (VMClass in general, possibly Object) last." + | theClass classes | + + classes := OrderedCollection new. + theClass := self. + [theClass == Object + or: [theClass == VMClass]] whileFalse: + [classes addLast: theClass. + theClass := theClass superclass]. + ^classes reverse! Item was changed: ----- Method: InterpreterPlugin class>>translateInDirectory:doInlining: (in category 'translation') ----- translateInDirectory: directory doInlining: inlineFlag "This is the default method for writing out sources for a plugin. Several classes need special handling, so look at all implementors of this message" | cg fname | fname := self moduleName, '.c'. "don't translate if the file is newer than my timeStamp" (directory entryAt: fname ifAbsent: nil) ifNotNil: [:fstat| | mTime | mTime := fstat modificationTime. mTime isInteger ifFalse: [mTime := mTime asSeconds]. (self allCodeOlderThan: mTime) ifTrue: [^nil]]. self initialize. + cg := self buildCodeGenerator. - cg := self buildCodeGeneratorUpTo: self. cg inferTypesForImplicitlyTypedVariablesAndMethods. self pruneUnusedInterpreterPluginMethodsIn: cg. cg storeCodeOnFile: (directory fullNameFor: fname) doInlining: inlineFlag. ^cg exportedPrimitiveNames asArray! Item was changed: ----- Method: SimpleStackBasedCogit>>genPrimitiveClosureValue (in category 'primitive generators') ----- genPrimitiveClosureValue "Check the argument count. Fail if wrong. Get the method from the outerContext and see if it is cogged. If so, jump to the block entry or the no-context-switch entry, as appropriate, and we're done. If not, invoke the interpreter primitive." | jumpFailNArgs jumpFail1 jumpFail2 jumpFail3 jumpFail4 jumpBCMethod primitiveRoutine result | <var: #jumpFail1 type: #'AbstractInstruction *'> <var: #jumpFail2 type: #'AbstractInstruction *'> <var: #jumpFail3 type: #'AbstractInstruction *'> <var: #jumpFail4 type: #'AbstractInstruction *'> <var: #jumpFailNArgs type: #'AbstractInstruction *'> <var: #jumpBCMethod type: #'AbstractInstruction *'> <var: #primitiveRoutine declareC: 'void (*primitiveRoutine)()'> objectRepresentation genLoadSlot: ClosureNumArgsIndex sourceReg: ReceiverResultReg destReg: TempReg. self CmpCq: (objectMemory integerObjectOf: methodOrBlockNumArgs) R: TempReg. jumpFailNArgs := self JumpNonZero: 0. objectRepresentation genLoadSlot: ClosureOuterContextIndex sourceReg: ReceiverResultReg destReg: ClassReg. jumpFail1 := objectRepresentation genJumpImmediate: ClassReg. objectRepresentation genGetCompactClassIndexNonImmOf: ClassReg into: TempReg. objectRepresentation genCmpClassMethodContextCompactIndexR: TempReg. jumpFail2 := self JumpNonZero: 0. "We defer unforwarding the receiver to the prologue; scanning blocks for inst var refs and only unforwarding if the block refers to inst vars." (false and: [objectRepresentation hasSpurMemoryManagerAPI]) ifTrue: [objectRepresentation genLoadSlot: ReceiverIndex sourceReg: ClassReg destReg: SendNumArgsReg; genEnsureOopInRegNotForwarded: SendNumArgsReg scratchReg: TempReg updatingSlot: ReceiverIndex in: ClassReg]. objectRepresentation genLoadSlot: MethodIndex sourceReg: ClassReg destReg: SendNumArgsReg. jumpFail3 := objectRepresentation genJumpImmediate: SendNumArgsReg. objectRepresentation genGetFormatOf: SendNumArgsReg into: TempReg. self CmpCq: objectMemory firstCompiledMethodFormat R: TempReg. jumpFail4 := self JumpLess: 0. objectRepresentation genLoadSlot: HeaderIndex sourceReg: SendNumArgsReg destReg: ClassReg. + jumpBCMethod := objectRepresentation genJumpImmediate: ClassReg. - jumpBCMethod := objectRepresentation genJumpSmallInteger: ClassReg. self MoveM16: (self offset: CogMethod of: #blockEntryOffset) r: ClassReg R: TempReg. self AddR: ClassReg R: TempReg. primitiveRoutine := coInterpreter functionPointerForCompiledMethod: methodObj primitiveIndex: primitiveIndex. primitiveRoutine = #primitiveClosureValueNoContextSwitch ifTrue: [blockNoContextSwitchOffset = nil ifTrue: [^NotFullyInitialized]. self SubCq: blockNoContextSwitchOffset R: TempReg]. self JumpR: TempReg. jumpBCMethod jmpTarget: (jumpFail1 jmpTarget: (jumpFail2 jmpTarget: (jumpFail3 jmpTarget: (jumpFail4 jmpTarget: self Label)))). (result := self compileInterpreterPrimitive: primitiveRoutine) < 0 ifTrue: [^result]. jumpFailNArgs jmpTarget: self Label. ^0! Item was changed: ----- Method: StackInterpreter>>tryLoadNewPlugin:pluginEntries: (in category 'primitive support') ----- tryLoadNewPlugin: pluginString pluginEntries: pluginEntries "Load the plugin and if on Spur, populate pluginEntries with the prmitives in the plugin." <doNotGenerate> | plugin realPluginClass plugins simulatorClasses | self transcript cr; show: 'Looking for module ', pluginString. "Defeat loading of the FloatArrayPlugin & Matrix2x3Plugin since complications with 32-bit float support prevent simulation. If you feel up to tackling this start by implementing cCoerce: value to: cType ^cType = 'float' ifTrue: [value asIEEE32BitWord] ifFalse: [value] in FloatArrayPlugin & Matrix2x3Plugin and then address the issues in the BalloonEnginePlugin. See http://forum.world.st/Simulating-the-BalloonEnginePlugin-FloatArrayPlugin-a…" (#('FloatArrayPlugin' 'Matrix2x3Plugin') includes: pluginString) ifTrue: [self transcript show: ' ... defeated'. ^nil]. pluginString isEmpty ifTrue: [plugin := self] ifFalse: [plugins := InterpreterPlugin allSubclasses select: [:psc| psc moduleName asString = pluginString asString]. simulatorClasses := (plugins select: [:psc| psc simulatorClass notNil] thenCollect: [:psc| psc simulatorClass]) asSet. simulatorClasses isEmpty ifTrue: [self transcript show: ' ... not found'. ^nil]. simulatorClasses size > 1 ifTrue: [^self error: 'This won''t work...']. (plugins copyWithoutAll: simulatorClasses) notEmpty ifTrue: [plugins := plugins copyWithoutAll: simulatorClasses]. plugins size > 1 ifTrue: [self transcript show: '...multiple plugin classes; choosing ', plugins last name]. realPluginClass := plugins last. "hopefully lowest in the hierarchy..." plugin := simulatorClasses anyOne newFor: realPluginClass. plugin setInterpreter: objectMemory. "Ignore return value from setInterpreter" (plugin respondsTo: #initialiseModule) ifTrue: [plugin initialiseModule ifFalse: [self transcript show: ' ... initialiser failed'. ^nil]]]. "module initialiser failed" self transcript show: ' ... loaded'. objectMemory hasSpurMemoryManagerAPI ifTrue: [| realPlugin cg | self transcript show: '...computing accessor depths'. plugin class isPluginClass ifTrue: [realPlugin := (plugin isSmartSyntaxPluginSimulator ifTrue: [realPluginClass] ifFalse: [plugin class]) withAllSuperclasses detect: [:class| class shouldBeTranslated]. + cg := realPlugin buildCodeGenerator] - cg := realPlugin buildCodeGeneratorUpTo: realPlugin] ifFalse: [cg := self codeGeneratorToComputeAccessorDepth. primitiveTable withIndexDo: [:prim :index| | depth | prim isSymbol ifTrue: [depth := cg accessorDepthForSelector: prim. self assert: (depth isInteger or: [depth isNil and: [(plugin class whichClassIncludesSelector: prim) isNil]]). primitiveAccessorDepthTable at: index - 1 put: depth]]]. cg exportedPrimitiveNames do: [:primName| | fnSymbol | fnSymbol := primName asSymbol. pluginEntries addLast: {plugin. fnSymbol. [plugin perform: fnSymbol. self]. cg accessorDepthForSelector: fnSymbol}]. self transcript show: '...done']. ^pluginString asString -> plugin! Item was changed: ----- Method: SurfacePlugin class>>translateInDirectory:doInlining: (in category 'translation') ----- translateInDirectory: directory doInlining: inlineFlag "handle a special case external file rather than normal generated code." | cg | self initialize. + cg := self buildCodeGenerator. - cg := self buildCodeGeneratorUpTo: self. "We rely on the fake entry points implemented on the instance side to allow the export list to be accurate. Please update them if you change the code" ^cg exportedPrimitiveNames asArray!

1 0

VM Maker: VMMaker.oscog-eem.1544.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.1544.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1544 Author: eem Time: 3 December 2015, 11:53:57.341 am UUID: 2c5a349c-21ac-4949-bc39-5a93f5eb243a Ancestors: VMMaker.oscog-eem.1543 x64 Cogit: Implement or fix OpCqR MulRR, relocation machinery etc. Add tests for OpCqR (to x86 also). Use assert:equals: and override in AbstractInstructionTests to do a case-insensitive comparison for strings. More facade machinery for in-image compilation. Update smallFloatValueOf: for running on 64-bit Spur (reduce the result to SmallFloat if possible). =============== Diff against VMMaker.oscog-eem.1543 =============== Item was added: + ----- Method: AbstractInstructionTests>>assert:equals: (in category 'accessing') ----- + assert: expected equals: actual + "Override to use a case-insensitive comparison for strings." + ^self + assert: (expected isString + ifTrue: [expected sameAs: actual] + ifFalse: [expected = actual]) + description: [ self comparingStringBetween: expected and: actual ] + ! Item was changed: + ----- Method: AbstractInstructionTests>>previousInstruction (in category 'accessing') ----- - ----- Method: AbstractInstructionTests>>previousInstruction (in category 'as yet unclassified') ----- previousInstruction <returnTypeC: #'AbstractInstruction *'> ^opcodes last! Item was changed: ----- Method: CogIA32Compiler>>relocateMethodReferenceBeforeAddress:by: (in category 'inline cacheing') ----- relocateMethodReferenceBeforeAddress: pc by: delta + <inline: true> self relocateCallBeforeReturnPC: pc by: delta! Item was added: + ----- Method: CogIA32CompilerTests>>testAddCqR (in category 'tests') ----- + testAddCqR + "self new testAddCqR" + self concreteCompilerClass registersWithNamesDo: + [:reg :regname| + #(16r1 16r3 16r7 16r555555 16rAAAAAA) do: + [:const| | inst len| + inst := self gen: AddCqR operand: const operand: reg. + len := inst concretizeAt: 0. + self processor + disassembleInstructionAt: 0 + In: inst machineCode object + into: [:str :sz| | plainJane herIntended | + "Convert e.g. '00000000: movl %eax, 0x2(%eax) : 89 40 02' to 'movl %eax, 0x2(%eax)'" + plainJane := self strip: str. + herIntended := 'addl $0x', (const printStringBase: 16 length: 8 padded: true), ', ', regname. + self assert: herIntended equals: plainJane. + self assert: len = sz]]]! Item was changed: ----- Method: CogIA32CompilerTests>>testAndCqR (in category 'tests') ----- testAndCqR "self new testAndCqR" + self concreteCompilerClass registersWithNamesDo: - CogIA32CompilerForTests registersWithNamesDo: [:reg :regname| #(16r1 16r3 16r7 16r555555 16rAAAAAA) do: [:const| | inst len| inst := self gen: AndCqR operand: const operand: reg. len := inst concretizeAt: 0. self processor disassembleInstructionAt: 0 In: inst machineCode object into: [:str :sz| | plainJane herIntended | "Convert e.g. '00000000: movl %eax, 0x2(%eax) : 89 40 02' to 'movl %eax, 0x2(%eax)'" plainJane := self strip: str. herIntended := 'andl $0x', (const printStringBase: 16 length: 8 padded: true), ', ', regname. + self assert: herIntended equals: plainJane. - self assert: (plainJane match: herIntended). self assert: len = sz]]]! Item was changed: ----- Method: CogIA32CompilerTests>>testCMPXCHGAwR (in category 'tests') ----- testCMPXCHGAwR "self new testCMPXCHGAwR" | cmpxchgAwR | cmpxchgAwR := CogIA32Compiler classPool at: #CMPXCHGAwR. CogIA32CompilerForTests registersWithNamesDo: [:reg :regname| #(16r555555 16rAAAAAA) do: [:addr| | inst len | inst := self gen: cmpxchgAwR operand: addr operand: reg. len := inst concretizeAt: 0. self processor disassembleInstructionAt: 0 In: inst machineCode object into: [:str :sz| | plainJane herIntended | "Convert e.g. '00000000: movl %eax, 0x2(%eax) : 89 40 02' to 'movl %eax, 0x2(%eax)'" plainJane := self strip: str. herIntended := 'cmpxchgl ', regname, ', 0x', (addr hex allButFirst: 3). + self assert: herIntended equals: plainJane. - self assert: (plainJane match: herIntended). self assert: len = sz]]]! Item was changed: ----- Method: CogIA32CompilerTests>>testCMPXCHGMwrR (in category 'tests') ----- testCMPXCHGMwrR "self new testCMPXCHGMwrR" | cmpxchgMwrR lock | cmpxchgMwrR := CogIA32Compiler classPool at: #CMPXCHGMwrR. lock := CogIA32Compiler classPool at: #LOCK. CogIA32CompilerForTests registersWithNamesDo: [:sreg :srname| CogIA32CompilerForTests registersWithNamesDo: [:dreg :drname| ((1 to: 19 by: 3) collect: [:po2| 2 raisedToInteger: po2]) do: [:offset| #(false true) do: [:prefixLock| | memory | self resetGen. prefixLock ifTrue: [self gen: lock]. self gen: cmpxchgMwrR operand: offset operand: sreg operand: dreg. memory := self generateInstructions. self processor disassembleInstructionAt: 0 In: memory into: [:str :sz| | plainJane herIntended | plainJane := self strip: str. herIntended := (prefixLock ifTrue: ['lock '] ifFalse: ['']), 'cmpxchgl ', drname, ', 0x', (offset hex allButFirst: 3), '(', srname, ')'. + self assert: herIntended equals: plainJane. - self assert: (plainJane match: herIntended). self assert: memory size = sz]]]]]! Item was added: + ----- Method: CogIA32CompilerTests>>testCmpCqR (in category 'tests') ----- + testCmpCqR + "self new testCmpCqR" + self concreteCompilerClass registersWithNamesDo: + [:reg :regname| + #(16r1 16r3 16r7 16r555555 16rAAAAAA) do: + [:const| | inst len| + inst := self gen: CmpCqR operand: const operand: reg. + len := inst concretizeAt: 0. + self processor + disassembleInstructionAt: 0 + In: inst machineCode object + into: [:str :sz| | plainJane herIntended | + "Convert e.g. '00000000: movl %eax, 0x2(%eax) : 89 40 02' to 'movl %eax, 0x2(%eax)'" + plainJane := self strip: str. + herIntended := 'cmpl $0x', (const printStringBase: 16 length: 8 padded: true), ', ', regname. + self assert: herIntended equals: plainJane. + self assert: len = sz]]]! Item was added: + ----- Method: CogIA32CompilerTests>>testLogicalShiftRightCqR (in category 'tests') ----- + testLogicalShiftRightCqR + "CogIA32CompilerTests new testLogicalShiftRightCqR" + self concreteCompilerClass registersWithNamesDo: + [:reg :regname| + 1 to: 31 do: + [:shift| | inst len | + inst := self gen: LogicalShiftRightCqR operand: shift operand: reg. + len := inst concretizeAt: 0. + self processor + disassembleInstructionAt: 0 + In: inst machineCode object + into: [:str :sz| | plainJane herIntended | + "Convert e.g. '00000000: movl %eax, 0x2(%eax) : 89 40 02' to 'movl %eax, 0x2(%eax)'" + plainJane := self strip: str. + herIntended := 'shrl $', (shift > 1 + ifTrue: ['0x', (shift printStringBase: 16 length: 2 padded: true)] + ifFalse: [shift asInteger]), ', ', regname. + self assert: herIntended equals: plainJane. + self assert: len = sz]]]! Item was changed: ----- Method: CogIA32CompilerTests>>testMoveAbR (in category 'tests') ----- testMoveAbR "self new testMoveAbR" CogIA32CompilerForTests registersWithNamesDo: [:reg :regname| #(16r555555 16rAAAAAA) do: [:addr| | inst len | inst := self gen: MoveAbR operand: addr operand: reg. len := inst concretizeAt: 0. self assert: inst byteReadsZeroExtend. self processor disassembleInstructionAt: 0 In: inst machineCode object into: [:str :sz| | plainJane herIntended | "Convert e.g. '00000000: movl %eax, 0x2(%eax) : 89 40 02' to 'movl %eax, 0x2(%eax)'" plainJane := self strip: str. herIntended := 'movzbl 0x', (addr hex allButFirst: 3), ', ', regname. + self assert: herIntended equals: plainJane. - self assert: (plainJane match: herIntended). self assert: len = sz]]]! Item was changed: ----- Method: CogIA32CompilerTests>>testMoveAwR (in category 'tests') ----- testMoveAwR "self new testMoveAwR" CogIA32CompilerForTests registersWithNamesDo: [:reg :regname| #(16r555555 16rAAAAAA) do: [:addr| | inst len | inst := self gen: MoveAwR operand: addr operand: reg. len := inst concretizeAt: 0. self processor disassembleInstructionAt: 0 In: inst machineCode object into: [:str :sz| | plainJane herIntended | "Convert e.g. '00000000: movl %eax, 0x2(%eax) : 89 40 02' to 'movl %eax, 0x2(%eax)'" plainJane := self strip: str. herIntended := 'movl 0x', (addr hex allButFirst: 3), ', ', regname. + self assert: herIntended equals: plainJane. - self assert: (plainJane match: herIntended). self assert: len = sz]]]! Item was changed: ----- Method: CogIA32CompilerTests>>testMoveM64rRd (in category 'tests') ----- testMoveM64rRd "self new testMoveM64rRd" CogIA32CompilerForTests registersWithNamesDo: [:sreg :srname| CogIA32CompilerForTests xmmRegistersWithNamesDo: [:dreg :drname| ((1 to: 19 by: 3) collect: [:po2| 2 raisedToInteger: po2]) do: [:offset| | inst len | inst := self gen: MoveM64rRd operand: offset operand: sreg operand: dreg. len := inst concretizeAt: 0. self processor disassembleInstructionAt: 0 In: inst machineCode object into: [:str :sz| | plainJane herIntended | plainJane := self strip: str. herIntended := 'movsd 0x', (offset hex allButFirst: 3), '(', srname, '), ', drname. + self assert: herIntended equals: plainJane. - self assert: (plainJane match: herIntended). self assert: len = sz]]]]! Item was changed: ----- Method: CogIA32CompilerTests>>testMoveMbrR (in category 'tests') ----- testMoveMbrR "self new testMoveMbrR" CogIA32CompilerForTests registersWithNamesDo: [:sreg :srname| CogIA32CompilerForTests registersWithNamesDo: [:dreg :drname| ((1 to: 19 by: 3) collect: [:po2| 2 raisedToInteger: po2]) do: [:offset| | inst len | inst := self gen: MoveMbrR operand: offset operand: sreg operand: dreg. len := inst concretizeAt: 0. self processor disassembleInstructionAt: 0 In: inst machineCode object into: [:str :sz| | plainJane herIntended | plainJane := self strip: str. herIntended := 'movzbl 0x', (offset hex allButFirst: 3), '(', srname, '), ', drname. + self assert: herIntended equals: plainJane. - self assert: (plainJane match: herIntended). self assert: len = sz]]]]! Item was changed: ----- Method: CogIA32CompilerTests>>testMoveMwrR (in category 'tests') ----- testMoveMwrR "self new testMoveMwrR" self concreteCompilerClass registersWithNamesDo: [:sreg :srname| self concreteCompilerClass registersWithNamesDo: [:dreg :drname| | inst len | #(0 64 65536 -64 -65536) do: [:offset| inst := self gen: MoveMwrR operand: offset operand: sreg operand: dreg. len := inst concretizeAt: 0. self processor disassembleInstructionAt: 0 In: inst machineCode object into: [:str :sz| | plainJane herIntended po | plainJane := self strip: str. po := offset bitAnd: 1 << self processor bitsInWord - 1. herIntended := 'movl ', (offset = 0 ifTrue: [''] ifFalse: ['0x', (po printStringBase: 16)]), '(', srname, '), ', drname. + self assert: herIntended equals: plainJane. - self assert: (plainJane match: herIntended). self assert: len = sz]]]] "| failures | failures := Dictionary new. self concreteCompilerClass registersWithNamesDo: [:sreg :srname| self concreteCompilerClass registersWithNamesDo: [:dreg :drname| | inst len | #(0 64 65536 -64 -65536) do: [:offset| inst := self gen: MoveMwrR operand: offset operand: sreg operand: dreg. len := inst concretizeAt: 0. self processor disassembleInstructionAt: 0 In: inst machineCode object into: [:str :sz| | plainJane herIntended po | plainJane := self strip: str. po := offset bitAnd: 1 << self processor bitsInWord - 1. herIntended := 'movl ', (offset = 0 ifTrue: [''] ifFalse: ['0x', (po printStringBase: 16)]), '(', srname, '), ', drname. ((plainJane match: herIntended) and: [len = sz]) ifFalse: [failures at: herIntended put: plainJane]]]]]. failures"! Item was changed: ----- Method: CogIA32CompilerTests>>testMoveRAb (in category 'tests') ----- testMoveRAb "self new testMoveRAb" CogIA32CompilerForTests byteRegistersWithNamesDo: [:reg :regname| #(16r555555 16rAAAAAA) do: [:addr| | inst len | inst := self gen: MoveRAb operand: reg operand: addr. len := inst concretizeAt: 0. self processor disassembleInstructionAt: 0 In: inst machineCode object into: [:str :sz| | plainJane herIntended | plainJane := self strip: str. herIntended := 'movb ', regname, ', 0x', (addr hex allButFirst: 3). + self assert: herIntended equals: plainJane. - self assert: (plainJane match: herIntended). self assert: len = sz]]]! Item was changed: ----- Method: CogIA32CompilerTests>>testMoveRAw (in category 'tests') ----- testMoveRAw "self new testMoveRAw" CogIA32CompilerForTests registersWithNamesDo: [:reg :regname| #(16r555555 16rAAAAAA) do: [:addr| | inst len | inst := self gen: MoveRAw operand: reg operand: addr. len := inst concretizeAt: 0. self processor disassembleInstructionAt: 0 In: inst machineCode object into: [:str :sz| | plainJane herIntended | plainJane := self strip: str. herIntended := 'movl ', regname, ', 0x', (addr hex allButFirst: 3). + self assert: herIntended equals: plainJane. - self assert: (plainJane match: herIntended). self assert: len = sz]]]! Item was changed: ----- Method: CogIA32CompilerTests>>testMoveRMbr (in category 'tests') ----- testMoveRMbr "self new testMoveRMbr" CogIA32CompilerForTests byteRegistersWithNamesDo: [:sreg :srname| CogIA32CompilerForTests registersWithNamesDo: [:dreg :drname| ((1 to: 19 by: 3) collect: [:po2| 2 raisedToInteger: po2]) do: [:offset| | inst len | inst := self gen: MoveRMbr operand: sreg operand: offset operand: dreg. len := inst concretizeAt: 0. self processor disassembleInstructionAt: 0 In: inst machineCode object into: [:str :sz| | plainJane herIntended | plainJane := self strip: str. herIntended := 'movb ', srname, ', 0x', (offset hex allButFirst: 3), '(', drname, ')'. + self assert: herIntended equals: plainJane. - self assert: (plainJane match: herIntended). self assert: len = sz]]]]! Item was changed: ----- Method: CogIA32CompilerTests>>testMoveRMwr (in category 'tests') ----- testMoveRMwr "self new testMoveRMwr" self concreteCompilerClass registersWithNamesDo: [:sreg :srname| self concreteCompilerClass registersWithNamesDo: [:dreg :drname| | inst len | #(0 64 65536 -64 -65536) do: [:offset| inst := self gen: MoveRMwr operand: sreg operand: offset operand: dreg. len := inst concretizeAt: 0. self processor disassembleInstructionAt: 0 In: inst machineCode object into: [:str :sz| | plainJane herIntended po | "Convert e.g. '00000000: movl %eax, 0x2(%eax) : 89 40 02' to 'movl %eax, 0x2(%eax)'" plainJane := self strip: str. po := offset bitAnd: 1 << self processor bitsInWord - 1. herIntended := 'movl ', srname, ', ', (offset = 0 ifTrue: [''] ifFalse: ['0x', (po printStringBase: 16)]), '(',drname,')'. + self assert: herIntended equals: plainJane. - self assert: (plainJane match: herIntended). self assert: len = sz]]]] "| failures | failures := Dictionary new. self concreteCompilerClass registersWithNamesDo: [:sreg :srname| self concreteCompilerClass registersWithNamesDo: [:dreg :drname| | inst len | #(0 64 65536 -64 -65536) do: [:offset| inst := self gen: MoveRMwr operand: sreg operand: offset operand: dreg. len := inst concretizeAt: 0. self processor disassembleInstructionAt: 0 In: inst machineCode object into: [:str :sz| | plainJane herIntended po | plainJane := self strip: str. po := offset bitAnd: 1 << self processor bitsInWord - 1. herIntended := 'movl ', srname, ', ', (offset = 0 ifTrue: [''] ifFalse: ['0x', (po printStringBase: 16)]), '(',drname,')'. ((plainJane match: herIntended) and: [len = sz]) ifFalse: [failures at: herIntended put: plainJane]]]]]. failures"! Item was changed: ----- Method: CogIA32CompilerTests>>testMoveRdM64r (in category 'tests') ----- testMoveRdM64r "self new testMoveRdM64r" CogIA32CompilerForTests xmmRegistersWithNamesDo: [:sreg :srname| CogIA32CompilerForTests registersWithNamesDo: [:dreg :drname| ((1 to: 19 by: 3) collect: [:po2| 2 raisedToInteger: po2]) do: [:offset| | inst len | inst := self gen: MoveRdM64r operand: sreg operand: offset operand: dreg. len := inst concretizeAt: 0. self processor disassembleInstructionAt: 0 In: inst machineCode object into: [:str :sz| | plainJane herIntended | plainJane := self strip: str. herIntended := 'movsd ', srname, ', 0x', (offset hex allButFirst: 3), '(', drname, ')'. + self assert: herIntended equals: plainJane. - self assert: (plainJane match: herIntended). self assert: len = sz]]]]! Item was changed: ----- Method: CogIA32CompilerTests>>testMoveXbrRR (in category 'tests') ----- testMoveXbrRR "self new testMoveXbrRR" CogIA32CompilerForTests registersWithNamesDo: [:idxreg :irname| irname ~= '%esp' ifTrue: [CogIA32CompilerForTests registersWithNamesDo: [:basereg :brname| CogIA32CompilerForTests registersWithNamesDo: [:dreg :drname| ((1 to: 19 by: 3) collect: [:po2| 2 raisedToInteger: po2]) do: [:offset| | inst len | inst := self gen: MoveXbrRR operand: idxreg operand: basereg operand: dreg. len := inst concretizeAt: 0. self processor disassembleInstructionAt: 0 In: inst machineCode object into: [:str :sz| | plainJane herIntended | "Convert e.g. '00000000: movzbl %ds:(%eax,%eax,1), %eax : 0F B6 04 00 ' to 'movzbl (%eax,%eax,1)'" plainJane := self strip: str. herIntended := 'movzbl (', brname, ',', irname, ',1), ',drname. + self assert: herIntended equals: plainJane. - self assert: (plainJane match: herIntended). self assert: len = sz]]]]]]! Item was changed: ----- Method: CogIA32CompilerTests>>testMoveXwrRR (in category 'tests') ----- testMoveXwrRR "self new testMoveXwrRR" CogIA32CompilerForTests registersWithNamesDo: [:idxreg :irname| irname ~= '%esp' ifTrue: [CogIA32CompilerForTests registersWithNamesDo: [:basereg :brname| CogIA32CompilerForTests registersWithNamesDo: [:dreg :drname| ((1 to: 19 by: 3) collect: [:po2| 2 raisedToInteger: po2]) do: [:offset| | inst len | inst := self gen: MoveXwrRR operand: idxreg operand: basereg operand: dreg. len := inst concretizeAt: 0. self processor disassembleInstructionAt: 0 In: inst machineCode object into: [:str :sz| | plainJane herIntended | "Convert e.g. '00000000: movl %eax, 0x2(%eax) : 89 40 02' to 'movl %eax, 0x2(%eax)'" plainJane := self strip: str. herIntended := 'movl (', brname, ',', irname, ',4), ',drname. + self assert: herIntended equals: plainJane. - self assert: (plainJane match: herIntended). self assert: len = sz]]]]]]! Item was added: + ----- Method: CogIA32CompilerTests>>testOrCqR (in category 'tests') ----- + testOrCqR + "self new testOrCqR" + self concreteCompilerClass registersWithNamesDo: + [:reg :regname| + #(16r1 16r3 16r7 16r555555 16rAAAAAA) do: + [:const| | inst len| + inst := self gen: OrCqR operand: const operand: reg. + len := inst concretizeAt: 0. + self processor + disassembleInstructionAt: 0 + In: inst machineCode object + into: [:str :sz| | plainJane herIntended | + "Convert e.g. '00000000: movl %eax, 0x2(%eax) : 89 40 02' to 'movl %eax, 0x2(%eax)'" + plainJane := self strip: str. + herIntended := 'orl $0x', (const printStringBase: 16 length: 8 padded: true), ', ', regname. + self assert: herIntended equals: plainJane. + self assert: len = sz]]]! Item was added: + ----- Method: CogIA32CompilerTests>>testSubCqR (in category 'tests') ----- + testSubCqR + "self new testSubCqR" + self concreteCompilerClass registersWithNamesDo: + [:reg :regname| + #(16r1 16r3 16r7 16r555555 16rAAAAAA) do: + [:const| | inst len| + inst := self gen: SubCqR operand: const operand: reg. + len := inst concretizeAt: 0. + self processor + disassembleInstructionAt: 0 + In: inst machineCode object + into: [:str :sz| | plainJane herIntended | + "Convert e.g. '00000000: movl %eax, 0x2(%eax) : 89 40 02' to 'movl %eax, 0x2(%eax)'" + plainJane := self strip: str. + herIntended := 'subl $0x', (const printStringBase: 16 length: 8 padded: true), ', ', regname. + self assert: herIntended equals: plainJane. + self assert: len = sz]]]! Item was changed: ----- Method: CogIA32CompilerTests>>testTstCqR (in category 'tests') ----- testTstCqR "self new testTstCqR" + self concreteCompilerClass registersWithNamesDo: - CogIA32CompilerForTests registersWithNamesDo: [:reg :theRegname| #(16r1 16r3 16r7 16r555555 16rAAAAAA) do: [:const| | op regname inst len constString| inst := self gen: TstCqR operand: const operand: reg. len := inst concretizeAt: 0. ((inst isQuick: const) and: [reg < 4]) ifTrue: [op := 'testb'. regname := #('%al' '%cl' '%dl' '%bl') at: reg + 1. constString := const printStringBase: 16 length: 2 padded: true] ifFalse: [op := 'testl'. regname := theRegname. constString := const printStringBase: 16 length: 8 padded: true]. self processor disassembleInstructionAt: 0 In: inst machineCode object into: [:str :sz| | plainJane herIntended | "Convert e.g. '00000000: movl %eax, 0x2(%eax) : 89 40 02' to 'movl %eax, 0x2(%eax)'" plainJane := self strip: str. herIntended := op, ' $0x', constString, ', ', regname. + self assert: herIntended equals: plainJane. - self assert: (plainJane match: herIntended). self assert: len = sz]]]! Item was changed: ----- Method: CogIA32CompilerTests>>testXCHGAwR (in category 'tests') ----- testXCHGAwR "self new testXCHGAwR" | xchgAwR | xchgAwR := CogIA32Compiler classPool at: #XCHGAwR. CogIA32CompilerForTests registersWithNamesDo: [:reg :regname| #(16r555555 16rAAAAAA) do: [:addr| | inst len | inst := self gen: xchgAwR operand: addr operand: reg. len := inst concretizeAt: 0. self processor disassembleInstructionAt: 0 In: inst machineCode object into: [:str :sz| | plainJane herIntended | "Convert e.g. '00000000: movl %eax, 0x2(%eax) : 89 40 02' to 'movl %eax, 0x2(%eax)'" plainJane := self strip: str. herIntended := 'xchgl ', regname, ', 0x', (addr hex allButFirst: 3). + self assert: herIntended equals: plainJane. - self assert: (plainJane match: herIntended). self assert: len = sz]]]! Item was changed: ----- Method: CogIA32CompilerTests>>testXCHGMwrR (in category 'tests') ----- testXCHGMwrR "self new testXCHGMwrR" | xchgMwrR | xchgMwrR := CogIA32Compiler classPool at: #XCHGMwrR. CogIA32CompilerForTests registersWithNamesDo: [:sreg :srname| CogIA32CompilerForTests registersWithNamesDo: [:dreg :drname| ((1 to: 19 by: 3) collect: [:po2| 2 raisedToInteger: po2]) do: [:offset| | memory | self resetGen. self gen: xchgMwrR operand: offset operand: sreg operand: dreg. memory := self generateInstructions. self processor disassembleInstructionAt: 0 In: memory into: [:str :sz| | plainJane herIntended | plainJane := self strip: str. herIntended := 'xchgl ', drname, ', 0x', (offset hex allButFirst: 3), '(', srname, ')'. + self assert: herIntended equals: plainJane. - self assert: (plainJane match: herIntended). self assert: memory size = sz]]]]! Item was changed: ----- Method: CogObjectRepresentationFor64BitSpur>>genGetHashFieldNonImmOf:asSmallIntegerInto: (in category 'compile abstract instructions') ----- genGetHashFieldNonImmOf: instReg asSmallIntegerInto: destReg "Fetch the instance's identity hash into destReg, encoded as a SmallInteger." cogit MoveMw: 0 r: instReg R: destReg; "Shift and mask the field leaving room for the SmallInteger tag." + LogicalShiftRightCq: objectMemory identityHashFullWordShift - self numTagBits R: destReg; - LogicalShiftRightCq: objectMemory identityHashFullWordShift - objectMemory numTagBits R: destReg; AndCq: objectMemory identityHashHalfWordMask << objectMemory numTagBits R: destReg; AddCq: objectMemory smallIntegerTag R: destReg. ^0! Item was added: + ----- Method: CogObjectRepresentationFor64BitSpur>>genShiftAwaySmallIntegerTagsInScratchReg: (in category 'compile abstract instructions') ----- + genShiftAwaySmallIntegerTagsInScratchReg: scratchReg + cogit ArithmeticShiftRightCq: self numTagBits R: scratchReg. + ^0! Item was added: + ----- Method: CogX64Compiler>>canMulRR (in category 'testing') ----- + canMulRR + <inline: true> + ^true! Item was changed: ----- Method: CogX64Compiler>>computeMaximumSize (in category 'generate machine code') ----- (excessive size, no diff calculated) Item was removed: - ----- Method: CogX64Compiler>>computeShiftCqRegSize (in category 'generate machine code') ----- - computeShiftCqRegSize - "Immediate shifts are limited to a maximum of 31." - <inline: true> - | distance | - distance := operands at: 0. - distance = 1 ifTrue: - [^3]. - distance <= 31 ifTrue: - [^4]. - distance = 32 ifTrue: - [^7]. - ^8! Item was added: + ----- Method: CogX64Compiler>>concretizeMulRR (in category 'generate machine code') ----- + concretizeMulRR + "Will get inlined into concretizeAt: switch." + <inline: true> + | reg1 reg2 | + reg1 := self concreteRegister: (operands at: 0). + reg2 := self concreteRegister: (operands at: 1). + machineCode + at: 0 put: (self rexR: reg2 x: 0 b: reg1); + at: 1 put: 16r0F; + at: 2 put: 16rAF; + at: 3 put: (self mod: ModReg RM: reg1 RO: reg2). + ^machineCodeSize := 4! Item was changed: ----- Method: CogX64Compiler>>concretizeShiftCqRegOpcode: (in category 'generate machine code') ----- concretizeShiftCqRegOpcode: regOpcode "Will get inlined into concretizeAt: switch." <inline: true> | distance reg | distance := operands at: 0. self assert: (distance between: 1 and: 63). reg := self concreteRegister: (operands at: 1). + machineCode at: 0 put: (self rexR: 0 x: 0 b: reg). - machineCode - at: 0 put: (self rexR: 0 x: 0 b: reg). distance = 1 ifTrue: [machineCode at: 1 put: 16rD1; at: 2 put: (self mod: ModReg RM: reg RO: regOpcode). ^machineCodeSize := 3]. machineCode at: 1 put: 16rC1; at: 2 put: (self mod: ModReg RM: reg RO: regOpcode); + at: 3 put: distance. + ^machineCodeSize := 4! - at: 3 put: (distance min: 31). - distance <= 31 ifTrue: - [^machineCodeSize := 4]. - distance = 32 ifTrue: - [machineCode - at: 4 put: 16rD1; - at: 5 put: (self mod: ModReg RM: reg RO: regOpcode). - ^machineCodeSize := 7]. - machineCode - at: 4 put: 16rC1; - at: 5 put: (self mod: ModReg RM: reg RO: regOpcode); - at: 6 put: distance - 31. - ^machineCodeSize := 8! Item was added: + ----- Method: CogX64Compiler>>relocateCallBeforeReturnPC:by: (in category 'inline cacheing') ----- + relocateCallBeforeReturnPC: retpc by: delta + | distance | + delta ~= 0 ifTrue: + [distance := ((objectMemory byteAt: retpc - 1) << 24) + + ((objectMemory byteAt: retpc - 2) << 16) + + ((objectMemory byteAt: retpc - 3) << 8) + + (objectMemory byteAt: retpc - 4). + distance := distance + delta. + objectMemory + byteAt: retpc - 1 put: (distance >> 24 bitAnd: 16rFF); + byteAt: retpc - 2 put: (distance >> 16 bitAnd: 16rFF); + byteAt: retpc - 3 put: (distance >> 8 bitAnd: 16rFF); + byteAt: retpc - 4 put: (distance bitAnd: 16rFF)]! Item was added: + ----- Method: CogX64Compiler>>relocateMethodReferenceBeforeAddress:by: (in category 'inline cacheing') ----- + relocateMethodReferenceBeforeAddress: pc by: delta + "We generate the method address using pc-relative addressing. + Simply check that rip-relative addressing is being used. c.f. + concretizeMoveCwR" + <inline: true> + self assert: ((objectMemory byteAt: pc - 6) = 16r8D + and: [((objectMemory byteAt: pc - 5) bitOr: (self mod: 0 RM: 0 RO: 7)) = (self mod: ModRegInd RM: 5 RO: 7)])! Item was added: + ----- Method: CogX64CompilerTests>>testAddCqR (in category 'tests') ----- + testAddCqR + "self new testAddCqR" + self concreteCompilerClass registersWithNamesDo: + [:reg :regname| + #(16r1 16r3 16r7 16r555555 16rAAAAAA) do: + [:const| | inst len| + inst := self gen: AddCqR operand: const operand: reg. + len := inst concretizeAt: 0. + self processor + disassembleInstructionAt: 0 + In: inst machineCode object + into: [:str :sz| | plainJane herIntended | + "Convert e.g. '00000000: movl %eax, 0x2(%eax) : 89 40 02' to 'movl %eax, 0x2(%eax)'" + plainJane := self strip: str. + herIntended := 'addq $0x', (const printStringBase: 16 length: 16 padded: true), ', ', regname. + self assert: (plainJane match: herIntended). + self assert: len = sz]]]! Item was changed: ----- Method: CogX64CompilerTests>>testAndCqR (in category 'tests') ----- testAndCqR "self new testAndCqR" self concreteCompilerClass registersWithNamesDo: [:reg :regname| #(16r1 16r3 16r7 16r555555 16rAAAAAA) do: [:const| | inst len| inst := self gen: AndCqR operand: const operand: reg. len := inst concretizeAt: 0. self processor disassembleInstructionAt: 0 In: inst machineCode object into: [:str :sz| | plainJane herIntended | + "Convert e.g. '00000000: movl %eax, 0x2(%eax) : 89 40 02' to 'movl %eax, 0x2(%eax)'" - "Convert e.g. '00000000: movl %rax, 0x2(%rax) : 48 89 40 02' to 'movl %rax, 0x2(%rax)'" plainJane := self strip: str. herIntended := 'andq $0x', (const printStringBase: 16 length: 16 padded: true), ', ', regname. self assert: (plainJane match: herIntended). self assert: len = sz]]]! Item was added: + ----- Method: CogX64CompilerTests>>testCmpCqR (in category 'tests') ----- + testCmpCqR + "self new testCmpCqR" + self concreteCompilerClass registersWithNamesDo: + [:reg :regname| + #(16r1 16r3 16r7 16r555555 16rAAAAAA) do: + [:const| | inst len| + inst := self gen: CmpCqR operand: const operand: reg. + len := inst concretizeAt: 0. + self processor + disassembleInstructionAt: 0 + In: inst machineCode object + into: [:str :sz| | plainJane herIntended | + "Convert e.g. '00000000: movl %eax, 0x2(%eax) : 89 40 02' to 'movl %eax, 0x2(%eax)'" + plainJane := self strip: str. + herIntended := 'cmpq $0x', (const printStringBase: 16 length: 16 padded: true), ', ', regname. + self assert: (plainJane match: herIntended). + self assert: len = sz]]]! Item was added: + ----- Method: CogX64CompilerTests>>testOrCqR (in category 'tests') ----- + testOrCqR + "self new testOrCqR" + self concreteCompilerClass registersWithNamesDo: + [:reg :regname| + #(16r1 16r3 16r7 16r555555 16rAAAAAA) do: + [:const| | inst len| + inst := self gen: OrCqR operand: const operand: reg. + len := inst concretizeAt: 0. + self processor + disassembleInstructionAt: 0 + In: inst machineCode object + into: [:str :sz| | plainJane herIntended | + "Convert e.g. '00000000: movl %eax, 0x2(%eax) : 89 40 02' to 'movl %eax, 0x2(%eax)'" + plainJane := self strip: str. + herIntended := 'orq $0x', (const printStringBase: 16 length: 16 padded: true), ', ', regname. + self assert: (plainJane match: herIntended). + self assert: len = sz]]]! Item was added: + ----- Method: CogX64CompilerTests>>testShiftCqR (in category 'tests') ----- + testShiftCqR + "CogX64CompilerTests new testShiftCqR" + {LogicalShiftRightCqR. LogicalShiftLeftCqR. ArithmeticShiftRightCqR} + with: #('shrq' 'shlq' 'sarq') + do: [:op :opname| + self concreteCompilerClass registersWithNamesDo: + [:reg :regname| + 1 to: 63 do: + [:shift| | inst len | + inst := self gen: op operand: shift operand: reg. + len := inst concretizeAt: 0. + self processor + disassembleInstructionAt: 0 + In: inst machineCode object + into: [:str :sz| | plainJane herIntended | + "Convert e.g. '00000000: movl %eax, 0x2(%eax) : 89 40 02' to 'movl %eax, 0x2(%eax)'" + plainJane := self strip: str. + herIntended := opname ,' $', (shift > 1 + ifTrue: ['0x', (shift printStringBase: 16 length: 2 padded: true)] + ifFalse: [shift asInteger]), ', ', regname. + self assert: herIntended equals: plainJane. + self assert: len = sz]]]]! Item was added: + ----- Method: CogX64CompilerTests>>testSubCqR (in category 'tests') ----- + testSubCqR + "self new testSubCqR" + self concreteCompilerClass registersWithNamesDo: + [:reg :regname| + #(16r1 16r3 16r7 16r555555 16rAAAAAA) do: + [:const| | inst len| + inst := self gen: SubCqR operand: const operand: reg. + len := inst concretizeAt: 0. + self processor + disassembleInstructionAt: 0 + In: inst machineCode object + into: [:str :sz| | plainJane herIntended | + "Convert e.g. '00000000: movl %eax, 0x2(%eax) : 89 40 02' to 'movl %eax, 0x2(%eax)'" + plainJane := self strip: str. + herIntended := 'subq $0x', (const printStringBase: 16 length: 16 padded: true), ', ', regname. + self assert: (plainJane match: herIntended). + self assert: len = sz]]]! Item was changed: ----- Method: CurrentImageCoInterpreterFacade>>oopForObject: (in category 'object map') ----- oopForObject: o + ^(o isInteger and: [o between: objectMemory minSmallInteger and: objectMemory maxSmallInteger]) - ^o isInteger ifTrue: [o << 1 bitOr: 1] ifFalse: [objectMap at: o ifAbsentPut: [objectMap size * 8 + (1024 * 1024)]]! Item was added: + ----- Method: CurrentImageCoInterpreterFacadeFor64BitSpurObjectRepresentation>>objectForOop: (in category 'private-cacheing') ----- + objectForOop: anOop + "This is a keyAtValue: search and so needs speeding up either by a reverse map or a simple cache." + ^(anOop bitAnd: 3) caseOf: { + [0] -> [anOop = cachedOop + ifTrue: [cachedObject] + ifFalse: [cachedObject := objectMap keyAtValue: anOop. "may raise Error" + cachedOop := anOop. "Dom't assign until accessed without error" + cachedObject]]. + [1] -> [anOop signedIntFromLong64 >> 3]. + [2] -> [Character value: anOop >> 3]. + [3] -> [objectMemory smallFloatValueOf: anOop] }! Item was added: + ----- Method: CurrentImageCoInterpreterFacadeFor64BitSpurObjectRepresentation>>oopForObject: (in category 'object map') ----- + oopForObject: o + o isNumber + ifTrue: + [o isInteger + ifTrue: + [(o between: objectMemory minSmallInteger and: objectMemory maxSmallInteger) ifTrue: + [^objectMemory integerObjectOf: o asInteger]] + ifFalse: + [o isFloat ifTrue: + [(objectMemory isSmallFloatValue: o) ifTrue: + [^objectMemory smallFloatValueOf: o]]]] + ifFalse: + [o isCharacter ifTrue: + [^objectMemory characterObjectOf: o asInteger]]. + ^objectMap at: o ifAbsentPut: [objectMap size * 8 + (1024 * 1024)]! Item was added: + ----- Method: CurrentImageCoInterpreterFacadeForSpurObjectRepresentation>>numSlotsFullShift (in category 'accessing') ----- + numSlotsFullShift + ^objectMemory numSlotsFullShift! Item was added: + ----- Method: CurrentImageCoInterpreterFacadeForSpurObjectRepresentation>>oopForObject: (in category 'object map') ----- + oopForObject: o + ^(o isInteger and: [o between: objectMemory minSmallInteger and: objectMemory maxSmallInteger]) + ifTrue: [o << 1 + 1] + ifFalse: + [o isCharacter + ifTrue: [o asInteger << 2 + 2] + ifFalse: [objectMap at: o ifAbsentPut: [objectMap size * 8 + (1024 * 1024)]]]! Item was changed: ----- Method: Spur64BitMemoryManager>>smallFloatValueOf: (in category 'interpreter access') ----- smallFloatValueOf: oop "Answer the C double precision floating point value of the argument, a SmallFloat. See section 61-bit Immediate Floats in the SpurMemoryManager class comment. msb lsb Decode: [8expsubset][52mantissa][1s][3tags] shift away tags: [ 000 ][8expsubset][52mantissa][1s] add exponent offset: [ 11 exponent ][52mantissa][1s] rot sign: [1s][ 11 exponent ][52mantissa]" | bits | <returnTypeC: #double> bits := self smallFloatBitsOf: oop. ^self cCode: [(self cCoerce: (self addressOf: bits) to: #'double *') at: 0] inSmalltalk: [(Float new: 2) at: 1 put: bits >> 32; at: 2 put: (bits bitAnd: 16rFFFFFFFF); + * 1.0 "reduce to SmallFloat64 if possible"]! - yourself]!

1 0

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

04 Dec '15

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.302.mcz ==================== Summary ==================== Name: Cog-eem.302 Author: eem Time: 3 December 2015, 3:12:23.656 pm UUID: 41077df0-b3a6-46a8-9247-c7500c69f44a Ancestors: Cog-eem.301 Add (or simplify) byte generators to x86 & x64 Bochs aliens. Implement x64 handleMovGbEbFailureAt:in:rex: Fix the accessors in BochsX64Alien's execution methods to be 64-bit. Make sure the call/return emulation includes PostBuildStackDelta. =============== Diff against Cog-eem.301 =============== Item was changed: ----- Method: BochsIA32Alien>>al (in category 'accessing') ----- al + ^self unsignedByteAt: 469! - ^self eax bitAnd: 16rFF! Item was changed: ----- Method: BochsIA32Alien>>al: (in category 'accessing') ----- + al: anUnsignedInteger + ^self unsignedByteAt: 469 put: anUnsignedInteger! - al: aByte - self eax: ((self eax bitAnd: -16rFF) + aByte). - ^aByte! Item was changed: ----- Method: BochsIA32Alien>>bl (in category 'accessing') ----- bl + ^self unsignedByteAt: 481! - ^self ebx bitAnd: 16rFF! Item was changed: ----- Method: BochsIA32Alien>>bl: (in category 'accessing') ----- + bl: anUnsignedInteger + ^self unsignedByteAt: 481 put: anUnsignedInteger! - bl: aByte - self ebx: ((self ebx bitAnd: -16rFF) + aByte). - ^aByte! Item was added: + ----- Method: BochsIA32Alien>>bpl (in category 'accessing') ----- + bpl + ^self unsignedByteAt: 489! Item was added: + ----- Method: BochsIA32Alien>>bpl: (in category 'accessing') ----- + bpl: anUnsignedInteger + ^self unsignedByteAt: 489 put: anUnsignedInteger! Item was changed: ----- Method: BochsIA32Alien>>cl (in category 'accessing') ----- cl + ^self unsignedByteAt: 473! - ^self ecx bitAnd: 16rFF! Item was changed: ----- Method: BochsIA32Alien>>cl: (in category 'accessing') ----- + cl: anUnsignedInteger + ^self unsignedByteAt: 473 put: anUnsignedInteger! - cl: aByte - self ecx: ((self ecx bitAnd: -16rFF) + aByte). - ^aByte! Item was added: + ----- Method: BochsIA32Alien>>dil (in category 'accessing') ----- + dil + ^self unsignedByteAt: 497! Item was added: + ----- Method: BochsIA32Alien>>dil: (in category 'accessing') ----- + dil: anUnsignedInteger + ^self unsignedByteAt: 497 put: anUnsignedInteger! Item was changed: ----- Method: BochsIA32Alien>>dl (in category 'accessing') ----- dl + ^self unsignedByteAt: 477! - ^self edx bitAnd: 16rFF! Item was changed: ----- Method: BochsIA32Alien>>dl: (in category 'accessing') ----- + dl: anUnsignedInteger + ^self unsignedByteAt: 477 put: anUnsignedInteger! - dl: aByte - self edx: ((self edx bitAnd: -16rFF) + aByte). - ^aByte! Item was changed: + ----- Method: BochsIA32Alien>>popWordIn: (in category 'execution') ----- - ----- Method: BochsIA32Alien>>popWordIn: (in category 'accessing-abstract') ----- popWordIn: aMemory | sp word | word := aMemory unsignedLongAt: (sp := self esp) + 1 bigEndian: false. self esp: sp + 4. ^word! Item was added: + ----- Method: BochsIA32Alien>>sil (in category 'accessing') ----- + sil + ^self unsignedByteAt: 493! Item was added: + ----- Method: BochsIA32Alien>>sil: (in category 'accessing') ----- + sil: anUnsignedInteger + ^self unsignedByteAt: 493 put: anUnsignedInteger! Item was added: + ----- Method: BochsIA32Alien>>spl (in category 'accessing') ----- + spl + ^self unsignedByteAt: 485! Item was added: + ----- Method: BochsIA32Alien>>spl: (in category 'accessing') ----- + spl: anUnsignedInteger + ^self unsignedByteAt: 485 put: anUnsignedInteger! Item was added: + ----- Method: BochsX64Alien>>al (in category 'accessing') ----- + al + ^self unsignedByteAt: 469! Item was added: + ----- Method: BochsX64Alien>>al: (in category 'accessing') ----- + al: anUnsignedInteger + ^self unsignedByteAt: 469 put: anUnsignedInteger! Item was added: + ----- Method: BochsX64Alien>>bl (in category 'accessing') ----- + bl + ^self unsignedByteAt: 493! Item was added: + ----- Method: BochsX64Alien>>bl: (in category 'accessing') ----- + bl: anUnsignedInteger + ^self unsignedByteAt: 493 put: anUnsignedInteger! Item was added: + ----- Method: BochsX64Alien>>bpl (in category 'accessing') ----- + bpl + ^self unsignedByteAt: 509! Item was added: + ----- Method: BochsX64Alien>>bpl: (in category 'accessing') ----- + bpl: anUnsignedInteger + ^self unsignedByteAt: 509 put: anUnsignedInteger! Item was added: + ----- Method: BochsX64Alien>>cl (in category 'accessing') ----- + cl + ^self unsignedByteAt: 477! Item was added: + ----- Method: BochsX64Alien>>cl: (in category 'accessing') ----- + cl: anUnsignedInteger + ^self unsignedByteAt: 477 put: anUnsignedInteger! Item was added: + ----- Method: BochsX64Alien>>dil (in category 'accessing') ----- + dil + ^self unsignedByteAt: 525! Item was added: + ----- Method: BochsX64Alien>>dil: (in category 'accessing') ----- + dil: anUnsignedInteger + ^self unsignedByteAt: 525 put: anUnsignedInteger! Item was added: + ----- Method: BochsX64Alien>>dl (in category 'accessing') ----- + dl + ^self unsignedByteAt: 485! Item was added: + ----- Method: BochsX64Alien>>dl: (in category 'accessing') ----- + dl: anUnsignedInteger + ^self unsignedByteAt: 485 put: anUnsignedInteger! Item was changed: ----- Method: BochsX64Alien>>handleMovGbEbFailureAt:in:rex: (in category 'error handling') ----- handleMovGbEbFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" rex: rexByteOrNil "<Integer|nil>" "Convert an execution primitive failure for a byte register load into a ProcessorSimulationTrap signal." + | modrmByte offset size | + modrmByte := memoryArray byteAt: pc + 3. + (modrmByte bitAnd: 16rC0) caseOf: { + [16r80 "ModRegRegDisp32"] -> [offset := memoryArray unsignedLongAt: pc + 4 bigEndian: false. + size := 7]. + [16r40 "ModRegRegDisp8"] -> [offset := memoryArray byteAt: pc + 4. + offset > 127 ifTrue: [offset := offset - 256]. + size := 4] } + otherwise: [self reportPrimitiveFailure]. + ^(ProcessorSimulationTrap + pc: pc + nextpc: pc + size + address: (((self perform: (self registerStateGetters at: (modrmByte bitAnd: 7) + ((rexByteOrNil bitAnd: 1) bitShift: 3) + 1)) + + offset) + bitAnd: 16rFFFFFFFFFFFFFFFF) + type: #read + accessor: (#(al: cl: dl: bl: spl: bpl: sil: dil: r8l: r9l: r10l: r11l: r12l: r13l: r14l: r15l:) at: ((modrmByte >> 3 bitAnd: 7) + ((rexByteOrNil bitAnd: 4) bitShift: 1) + 1))) + signal! - | modrmByte | - self shouldBeImplemented. - ^(((modrmByte := memoryArray byteAt: pc + 2) bitAnd: 16rC0) = 16r80) "ModRegRegDisp32" - ifTrue: - [(ProcessorSimulationTrap - pc: pc - nextpc: pc + 6 - address: ((self perform: (#(eax ecx edx ebx esp ebp esi edi) at: (modrmByte bitAnd: 7) + 1)) - + (memoryArray unsignedLongAt: pc + 3 bigEndian: false) - bitAnd: 16rFFFFFFFF) - type: #read - accessor: (#(al: cl: dl: bl: ah: ch: dh: bh:) at: ((modrmByte >> 3 bitAnd: 7) + 1))) - signal] - ifFalse: - [self reportPrimitiveFailure]! Item was changed: ----- Method: BochsX64Alien>>initializeStackFor: (in category 'processor setup') ----- initializeStackFor: aCogit "Different cpus need different stack alignment etc, so handle the details here." "From the System V ABI: 3.2.2 The Stack Frame ... The end of the input argument area shall be aligned on a 16 (32, if __m256 is passed on stack) byte boundary. In other words, the value (%rsp + 8) is always a multiple of 16 (32) when control is transferred to the function entry point." + | stackAlignment | + stackAlignment := 16. + aCogit setStackAlignment: stackAlignment expectedSPOffset: 0 expectedFPOffset: 16. + PostBuildStackDelta := stackAlignment > 16 + ifTrue: [stackAlignment - 16] + ifFalse: [0]! - aCogit setStackAlignment: 16 expectedSPOffset: 0 expectedFPOffset: 0! Item was changed: + ----- Method: BochsX64Alien>>popWordIn: (in category 'execution') ----- - ----- Method: BochsX64Alien>>popWordIn: (in category 'accessing-abstract') ----- popWordIn: aMemory | sp word | + word := aMemory long64At: (sp := self rsp) + 1. - word := aMemory unsignedLongAt: (sp := self rsp) + 1 bigEndian: false. self rsp: sp + 8. ^word! Item was added: + ----- Method: BochsX64Alien>>r10l (in category 'accessing') ----- + r10l + ^self unsignedByteAt: 549! Item was added: + ----- Method: BochsX64Alien>>r10l: (in category 'accessing') ----- + r10l: anUnsignedInteger + ^self unsignedByteAt: 549 put: anUnsignedInteger! Item was added: + ----- Method: BochsX64Alien>>r11l (in category 'accessing') ----- + r11l + ^self unsignedByteAt: 557! Item was added: + ----- Method: BochsX64Alien>>r11l: (in category 'accessing') ----- + r11l: anUnsignedInteger + ^self unsignedByteAt: 557 put: anUnsignedInteger! Item was added: + ----- Method: BochsX64Alien>>r12l (in category 'accessing') ----- + r12l + ^self unsignedByteAt: 565! Item was added: + ----- Method: BochsX64Alien>>r12l: (in category 'accessing') ----- + r12l: anUnsignedInteger + ^self unsignedByteAt: 565 put: anUnsignedInteger! Item was added: + ----- Method: BochsX64Alien>>r13l (in category 'accessing') ----- + r13l + ^self unsignedByteAt: 573! Item was added: + ----- Method: BochsX64Alien>>r13l: (in category 'accessing') ----- + r13l: anUnsignedInteger + ^self unsignedByteAt: 573 put: anUnsignedInteger! Item was added: + ----- Method: BochsX64Alien>>r14l (in category 'accessing') ----- + r14l + ^self unsignedByteAt: 581! Item was added: + ----- Method: BochsX64Alien>>r14l: (in category 'accessing') ----- + r14l: anUnsignedInteger + ^self unsignedByteAt: 581 put: anUnsignedInteger! Item was added: + ----- Method: BochsX64Alien>>r15l (in category 'accessing') ----- + r15l + ^self unsignedByteAt: 589! Item was added: + ----- Method: BochsX64Alien>>r15l: (in category 'accessing') ----- + r15l: anUnsignedInteger + ^self unsignedByteAt: 589 put: anUnsignedInteger! Item was added: + ----- Method: BochsX64Alien>>r8l (in category 'accessing') ----- + r8l + ^self unsignedByteAt: 533! Item was added: + ----- Method: BochsX64Alien>>r8l: (in category 'accessing') ----- + r8l: anUnsignedInteger + ^self unsignedByteAt: 533 put: anUnsignedInteger! Item was added: + ----- Method: BochsX64Alien>>r9l (in category 'accessing') ----- + r9l + ^self unsignedByteAt: 541! Item was added: + ----- Method: BochsX64Alien>>r9l: (in category 'accessing') ----- + r9l: anUnsignedInteger + ^self unsignedByteAt: 541 put: anUnsignedInteger! Item was changed: ----- Method: BochsX64Alien>>retpcIn: (in category 'accessing-abstract') ----- retpcIn: aMemory + ^aMemory long64At: self rbp + 9! - ^aMemory unsignedLongAt: self rbp + 9 bigEndian: false! Item was added: + ----- Method: BochsX64Alien>>sil (in category 'accessing') ----- + sil + ^self unsignedByteAt: 517! Item was added: + ----- Method: BochsX64Alien>>sil: (in category 'accessing') ----- + sil: anUnsignedInteger + ^self unsignedByteAt: 517 put: anUnsignedInteger! Item was changed: ----- Method: BochsX64Alien>>simulateCallOf:nextpc:memory: (in category 'execution') ----- simulateCallOf: address nextpc: nextpc memory: aMemory "Simulate a frame-building call of address. 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 From the System V ABI: 3.2.2 The Stack Frame ... The end of the input argument area shall be aligned on a 16 (32, if __m256 is passed on stack) byte boundary. In other words, the value (%rsp + 8) is always a multiple of 16 (32) when control is transferred to the function entry point." self pushWord: nextpc in: aMemory. self pushWord: self rbp in: aMemory. self rbp: self rsp. + PostBuildStackDelta ~= 0 ifTrue: + [self rsp: self rsp - PostBuildStackDelta]. self rip: address! Item was added: + ----- Method: BochsX64Alien>>spl (in category 'accessing') ----- + spl + ^self unsignedByteAt: 501! Item was added: + ----- Method: BochsX64Alien>>spl: (in category 'accessing') ----- + spl: anUnsignedInteger + ^self unsignedByteAt: 501 put: anUnsignedInteger!

1 0

[commit][3513] Add byte accessor generation to the Bochs source generators
by commits＠squeakvm.org 04 Dec '15

04 Dec '15

Revision: 3513 Author: eliot Date: 2015-12-03 15:09:55 -0800 (Thu, 03 Dec 2015) Log Message: ----------- Add byte accessor generation to the Bochs source generators Modified Paths: -------------- branches/Cog/processors/IA32/bochs/exploration/Makefile branches/Cog/processors/IA32/bochs/exploration/printcpu.c branches/Cog/processors/IA32/bochs/explorationx64/Makefile branches/Cog/processors/IA32/bochs/explorationx64/printcpu.c Modified: branches/Cog/processors/IA32/bochs/exploration/Makefile =================================================================== --- branches/Cog/processors/IA32/bochs/exploration/Makefile 2015-12-02 20:56:33 UTC (rev 3512) +++ branches/Cog/processors/IA32/bochs/exploration/Makefile 2015-12-03 23:09:55 UTC (rev 3513) @@ -1,10 +1,15 @@ -LIBDEPS=../../bochs/cpu/libcpu.a -CFLAGS=-m32 -I.. -I../../bochs -I../../bochs/cpu -I../../bochs/instrument/stubs -L../cpu -lcpu -FULLLIBS=-L../fpu -lfpu -L../disasm -ldisasm +#LIBDEPS=../../bochs/cpu/libcpu.a +#BOCHS=../../bochs +#BOCHSEXP=../../bochs/exploration +LIBDEPS=../cpu/libcpu.a +BOCHS=../../../processors/IA32/bochs +BOCHSEXP=. +CFLAGS=-m32 -I.. -I$(BOCHS) -I$(BOCHS)/cpu -I$(BOCHS)/instrument/stubs -L../cpu -lcpu .PHONY: $(LIBDEPS) -all: bxcpu.txt BochsIA32Alien-regs.st BochsIA32Alien-cr.st BochsIA32Alien-xmm.st +#all: bxcpu.txt BochsIA32Alien-regs.st BochsIA32Alien-cr.st BochsIA32Alien-xmm.st +all: BochsIA32Alien-regs.st BochsIA32Alien-cr.st BochsIA32Alien-xmm.st bxcpu.txt: printbxcpu ./printbxcpu >bxcpu.txt @@ -23,14 +28,14 @@ rm -f printcpu printcpucr printcpuxmm rm -f printcpu.exe printcpucr.exe printcpuxmm.exe -printbxcpu: ../../bochs/exploration/printbxcpu.cpp $(LIBDEPS) +printbxcpu: $(BOCHSEXP)/printbxcpu.cpp $(LIBDEPS) g++ -o $@ $< $(CFLAGS) -printcpu: ../../bochs/exploration/printcpu.c $(LIBDEPS) +printcpu: $(BOCHSEXP)/printcpu.c $(LIBDEPS) g++ -o $@ $< $(CFLAGS) -printcpucr: ../../bochs/exploration/printcpucr.c $(LIBDEPS) +printcpucr: $(BOCHSEXP)/printcpucr.c $(LIBDEPS) g++ -o $@ $< $(CFLAGS) -printcpuxmm: ../../bochs/exploration/printcpuxmm.c $(LIBDEPS) +printcpuxmm: $(BOCHSEXP)/printcpuxmm.c $(LIBDEPS) g++ -o $@ $< $(CFLAGS) Modified: branches/Cog/processors/IA32/bochs/exploration/printcpu.c =================================================================== --- branches/Cog/processors/IA32/bochs/exploration/printcpu.c 2015-12-02 20:56:33 UTC (rev 3512) +++ branches/Cog/processors/IA32/bochs/exploration/printcpu.c 2015-12-03 23:09:55 UTC (rev 3513) @@ -28,12 +28,18 @@ main() { #define stoffsetof(type,field) (offsetof(type,field)+1) -#define print(r,n) \ +#define print(r,n,b) \ printf("!BochsIA32Alien methodsFor: 'accessing' stamp: 'eem %d/%d/%d %d:%02d'!\r"\ "%s\r\t^self unsignedLongAt: %ld! !\r", m,d,y,h,i, lower(#r), \ stoffsetof(BX_CPU_C,gen_reg[n].dword.erx));\ printf("!BochsIA32Alien methodsFor: 'accessing' stamp: 'eem %d/%d/%d %d:%02d'!\r"\ "%s: anUnsignedInteger\r\t^self unsignedLongAt: %ld put: anUnsignedInteger! !\r", m,d,y,h,i, lower(#r), \ + stoffsetof(BX_CPU_C,gen_reg[n].dword.erx));\ +printf("!BochsIA32Alien methodsFor: 'accessing' stamp: 'eem %d/%d/%d %d:%02d'!\r"\ + "%s\r\t^self unsignedByteAt: %ld! !\r", m,d,y,h,i, lower(#b), \ + stoffsetof(BX_CPU_C,gen_reg[n].dword.erx));\ +printf("!BochsIA32Alien methodsFor: 'accessing' stamp: 'eem %d/%d/%d %d:%02d'!\r"\ + "%s: anUnsignedInteger\r\t^self unsignedByteAt: %ld put: anUnsignedInteger! !\r", m,d,y,h,i, lower(#b), \ stoffsetof(BX_CPU_C,gen_reg[n].dword.erx)) time_t nowsecs = time(0); @@ -52,15 +58,15 @@ "eflags\r\t^self unsignedLongAt: %ld! !\r", m,d,y,h,i, stoffsetof(BX_CPU_C,eflags)); - print(EAX,BX_32BIT_REG_EAX); - print(EBX,BX_32BIT_REG_EBX); - print(ECX,BX_32BIT_REG_ECX); - print(EDX,BX_32BIT_REG_EDX); - print(ESP,BX_32BIT_REG_ESP); - print(EBP,BX_32BIT_REG_EBP); - print(ESI,BX_32BIT_REG_ESI); - print(EDI,BX_32BIT_REG_EDI); - print(EIP,BX_32BIT_REG_EIP); + print(EAX,BX_32BIT_REG_EAX,al); + print(EBX,BX_32BIT_REG_EBX,bl); + print(ECX,BX_32BIT_REG_ECX,cl); + print(EDX,BX_32BIT_REG_EDX,dl); + print(ESP,BX_32BIT_REG_ESP,spl); + print(EBP,BX_32BIT_REG_EBP,bpl); + print(ESI,BX_32BIT_REG_ESI,sil); + print(EDI,BX_32BIT_REG_EDI,dil); + print(EIP,BX_32BIT_REG_EIP,ipl); /* the ipl: method should be discarded */ return 0; } Modified: branches/Cog/processors/IA32/bochs/explorationx64/Makefile =================================================================== --- branches/Cog/processors/IA32/bochs/explorationx64/Makefile 2015-12-02 20:56:33 UTC (rev 3512) +++ branches/Cog/processors/IA32/bochs/explorationx64/Makefile 2015-12-03 23:09:55 UTC (rev 3513) @@ -1,6 +1,10 @@ +#LIBDEPS=../../bochs/cpu/libcpu.a +#BOCHS=../../bochs +#BOCHSEXP=../../bochs/exploration #BOCHS=../../../processors/IA32/bochs -BOCHS=../../processors/IA32/bochs -BOCHSEX64=$(BOCHS)/explorationx64 +#BOCHSEX64=$(BOCHS)/explorationx64 +BOCHS=../../../processors/IA32/bochs +BOCHSEX64=. LIBDEPS=../../cpu/libcpu.a CFLAGS=-m32 -I.. -I$(BOCHS) -I$(BOCHS)/cpu -I$(BOCHS)/instrument/stubs -L../cpu -lcpu FULLLIBS=-L../fpu -lfpu -L../disasm -ldisasm Modified: branches/Cog/processors/IA32/bochs/explorationx64/printcpu.c =================================================================== --- branches/Cog/processors/IA32/bochs/explorationx64/printcpu.c 2015-12-02 20:56:33 UTC (rev 3512) +++ branches/Cog/processors/IA32/bochs/explorationx64/printcpu.c 2015-12-03 23:09:55 UTC (rev 3513) @@ -28,12 +28,18 @@ main() { #define stoffsetof(type,field) (offsetof(type,field)+1) -#define print(r,n) \ +#define print(r,n,b) \ printf("!BochsX64Alien methodsFor: 'accessing' stamp: 'eem %d/%d/%d %d:%02d'!\r"\ "%s\r\t^self unsignedLongLongAt: %ld! !\r", m,d,y,h,i, lower(#r), \ stoffsetof(BX_CPU_C,gen_reg[n].dword.erx));\ printf("!BochsX64Alien methodsFor: 'accessing' stamp: 'eem %d/%d/%d %d:%02d'!\r"\ "%s: anUnsignedInteger\r\t^self unsignedLongLongAt: %ld put: anUnsignedInteger! !\r", m,d,y,h,i, lower(#r), \ + stoffsetof(BX_CPU_C,gen_reg[n].dword.erx));\ +printf("!BochsX64Alien methodsFor: 'accessing' stamp: 'eem %d/%d/%d %d:%02d'!\r"\ + "%s\r\t^self unsignedByteAt: %ld! !\r", m,d,y,h,i, lower(#b), \ + stoffsetof(BX_CPU_C,gen_reg[n].dword.erx));\ +printf("!BochsX64Alien methodsFor: 'accessing' stamp: 'eem %d/%d/%d %d:%02d'!\r"\ + "%s: anUnsignedInteger\r\t^self unsignedByteAt: %ld put: anUnsignedInteger! !\r", m,d,y,h,i, lower(#b), \ stoffsetof(BX_CPU_C,gen_reg[n].dword.erx)) time_t nowsecs = time(0); @@ -52,23 +58,23 @@ "rflags\r\t^self unsignedLongLongAt: %ld! !\r", m,d,y,h,i, stoffsetof(BX_CPU_C,eflags)); - print(RAX,BX_64BIT_REG_RAX); - print(RBX,BX_64BIT_REG_RBX); - print(RCX,BX_64BIT_REG_RCX); - print(RDX,BX_64BIT_REG_RDX); - print(RSP,BX_64BIT_REG_RSP); - print(RBP,BX_64BIT_REG_RBP); - print(RSI,BX_64BIT_REG_RSI); - print(RDI,BX_64BIT_REG_RDI); - print(R8,BX_64BIT_REG_R8); - print(R9,BX_64BIT_REG_R9); - print(R10,BX_64BIT_REG_R10); - print(R11,BX_64BIT_REG_R11); - print(R12,BX_64BIT_REG_R12); - print(R13,BX_64BIT_REG_R13); - print(R14,BX_64BIT_REG_R14); - print(R15,BX_64BIT_REG_R15); - print(RIP,BX_64BIT_REG_RIP); + print(RAX,BX_64BIT_REG_RAX,al); + print(RBX,BX_64BIT_REG_RBX,bl); + print(RCX,BX_64BIT_REG_RCX,cl); + print(RDX,BX_64BIT_REG_RDX,dl); + print(RSP,BX_64BIT_REG_RSP,spl); + print(RBP,BX_64BIT_REG_RBP,bpl); + print(RSI,BX_64BIT_REG_RSI,sil); + print(RDI,BX_64BIT_REG_RDI,dil); + print(R8,BX_64BIT_REG_R8,r8l); + print(R9,BX_64BIT_REG_R9,r9l); + print(R10,BX_64BIT_REG_R10,r10l); + print(R11,BX_64BIT_REG_R11,r11l); + print(R12,BX_64BIT_REG_R12,r12l); + print(R13,BX_64BIT_REG_R13,r13l); + print(R14,BX_64BIT_REG_R14,r14l); + print(R15,BX_64BIT_REG_R15,r15l); + print(RIP,BX_64BIT_REG_RIP,ipl); /* the ipl: method should be discarded */ return 0; }

1 0

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

03 Dec '15

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.301.mcz ==================== Summary ==================== Name: Cog-eem.301 Author: eem Time: 3 December 2015, 11:48:03.601 am UUID: bae53821-4d4c-4a3f-87d3-f7e8e5e5bd84 Ancestors: Cog-eem.300 More execution simulation machinery and fixes for the x64 plugin. =============== Diff against Cog-eem.300 =============== Item was changed: ----- Method: BochsX64Alien>>handleRetFailureAt:in:rex: (in category 'error handling') ----- handleRetFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" rex: rexByteOrNil "<Integer|nil>" "Convert an execution primitive failure for a ret into a ProcessorSimulationTrap signal." self shouldBeImplemented. ^(ProcessorSimulationTrap pc: pc nextpc: pc + 1 + address: (memoryArray unsignedLong64At: self rsp + 1) - address: (memoryArray unsignedLongAt: self esp + 1) type: #return + accessor: #rip:) - accessor: #eip:) signal! Item was added: + ----- Method: BochsX64Alien>>popWordIn: (in category 'accessing-abstract') ----- + popWordIn: aMemory + | sp word | + word := aMemory unsignedLongAt: (sp := self rsp) + 1 bigEndian: false. + self rsp: sp + 8. + ^word! Item was added: + ----- Method: BochsX64Alien>>retpcIn: (in category 'accessing-abstract') ----- + retpcIn: aMemory + ^aMemory unsignedLongAt: self rbp + 9 bigEndian: false! Item was added: + ----- Method: BochsX64Alien>>simulateReturnIn: (in category 'execution') ----- + simulateReturnIn: aMemory + PostBuildStackDelta ~= 0 ifTrue: + [self rsp: self rsp + PostBuildStackDelta]. + self rbp: (self popWordIn: aMemory). + self rip: (self popWordIn: aMemory)! Item was added: + ----- Method: BochsX64Alien>>smashCallerSavedRegistersWithValuesFrom:by: (in category 'accessing-abstract') ----- + smashCallerSavedRegistersWithValuesFrom: base by: step + #(rax: rcx: rdx: rsi: rdi: r8: r9: r10: r11:) + withIndexDo: + [:accessor :index| + self perform: accessor with: index - 1 * step + base]!

1 0

VM Maker: VMMaker.oscog-tpr.1544.mcz
by commits＠source.squeak.org 03 Dec '15

03 Dec '15

tim Rowledge uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-tpr.1544.mcz ==================== Summary ==================== Name: VMMaker.oscog-tpr.1544 Author: tpr Time: 3 December 2015, 11:43:44.105 am UUID: 22ab52d9-be46-4ff2-b6d8-c0fe0b7a3032 Ancestors: VMMaker.oscog-eem.1543 A few changes to make building the Balloon3D plugin work ok for both cog and trunk vmmaker. Since the pluginClassesUptO: & buildCodegeneratorUpTo: were simply ignoringthe argument, stop bothering to send it. Left a stub version in case other plugin code uses it, with a depracation warning. Builds a vm that compiles and runs on Pi =============== Diff against VMMaker.oscog-eem.1543 =============== Item was changed: ----- Method: InterpreterPlugin class>>allCodeOlderThan: (in category 'translation') ----- allCodeOlderThan: modificationTime + ^((self pluginClassesUpToRoot) allSatisfy: - ^((self pluginClassesUpTo: self) allSatisfy: [:aPluginClass| aPluginClass timeStamp < modificationTime]) and: [self translatedPrimitives allSatisfy: [:pair| | c m stamp | c := Smalltalk classNamed: pair first. m := c compiledMethodAt: pair last ifAbsent: [c class >> pair last]. stamp := (m timeStamp subStrings: {Character space}) last: 2. stamp := TimeStamp date: (Date fromString: stamp first) time: (Time fromString: stamp last). stamp asSeconds < modificationTime]]! Item was added: + ----- Method: InterpreterPlugin class>>buildCodeGenerator (in category 'translation') ----- + buildCodeGenerator + "Build a CCodeGenerator for the plugin" + | cg pluginClasses | + cg := self codeGeneratorClass new initialize. + cg pluginClass: self. + (pluginClasses := self pluginClassesUpToRoot) do: + [:aClass| cg addClass: aClass]. + (cg structClassesForTranslationClasses: pluginClasses) do: + [:structClasss| cg addStructClass: structClasss]. + cg addMethodsForTranslatedPrimitives: self translatedPrimitives. + ^cg! Item was changed: ----- Method: InterpreterPlugin class>>buildCodeGeneratorUpTo: (in category 'translation') ----- buildCodeGeneratorUpTo: aPluginClass + "Build a CCodeGenerator for the plugin - Deprecated and here only in case old plugin code tries to use it" + self deprecated. + ^self buildCodeGenerator! - "Build a CCodeGenerator for the plugin" - | cg pluginClasses | - cg := self codeGeneratorClass new initialize. - cg pluginClass: self. - (pluginClasses := self pluginClassesUpTo: aPluginClass) do: - [:aClass| cg addClass: aClass]. - (cg structClassesForTranslationClasses: pluginClasses) do: - [:structClasss| cg addStructClass: structClasss]. - cg addMethodsForTranslatedPrimitives: self translatedPrimitives. - ^cg! Item was added: + ----- Method: InterpreterPlugin class>>moduleFileName (in category 'translation') ----- + moduleFileName + "Answer the receiver's module name that is used for the plugin's C code." + + ^ self moduleName, self moduleExtension! Item was removed: - ----- Method: InterpreterPlugin class>>pluginClassesUpTo: (in category 'translation') ----- - pluginClassesUpTo: aPluginClass - "Answer the classes to include for translation of aPluginClass, superclasses first, aPluginClass last." - | theClass classes | - - classes := OrderedCollection new. - theClass := self. - [theClass == Object - or: [theClass == VMClass]] whileFalse: - [classes addLast: theClass. - theClass := theClass superclass]. - ^classes reverse! Item was added: + ----- Method: InterpreterPlugin class>>pluginClassesUpToRoot (in category 'translation') ----- + pluginClassesUpToRoot + "Answer the classes to include for translation of aPluginClass, superclasses first, and the root (VMClass in general, possibly Object) last." + | theClass classes | + + classes := OrderedCollection new. + theClass := self. + [theClass == Object + or: [theClass == VMClass]] whileFalse: + [classes addLast: theClass. + theClass := theClass superclass]. + ^classes reverse! Item was changed: ----- Method: InterpreterPlugin class>>translateInDirectory:doInlining: (in category 'translation') ----- translateInDirectory: directory doInlining: inlineFlag "This is the default method for writing out sources for a plugin. Several classes need special handling, so look at all implementors of this message" | cg fname | fname := self moduleName, '.c'. "don't translate if the file is newer than my timeStamp" (directory entryAt: fname ifAbsent: nil) ifNotNil: [:fstat| | mTime | mTime := fstat modificationTime. mTime isInteger ifFalse: [mTime := mTime asSeconds]. (self allCodeOlderThan: mTime) ifTrue: [^nil]]. self initialize. + cg := self buildCodeGenerator. - cg := self buildCodeGeneratorUpTo: self. cg inferTypesForImplicitlyTypedVariablesAndMethods. self pruneUnusedInterpreterPluginMethodsIn: cg. cg storeCodeOnFile: (directory fullNameFor: fname) doInlining: inlineFlag. ^cg exportedPrimitiveNames asArray! Item was changed: ----- Method: StackInterpreter>>tryLoadNewPlugin:pluginEntries: (in category 'primitive support') ----- tryLoadNewPlugin: pluginString pluginEntries: pluginEntries "Load the plugin and if on Spur, populate pluginEntries with the prmitives in the plugin." <doNotGenerate> | plugin realPluginClass plugins simulatorClasses | self transcript cr; show: 'Looking for module ', pluginString. "Defeat loading of the FloatArrayPlugin & Matrix2x3Plugin since complications with 32-bit float support prevent simulation. If you feel up to tackling this start by implementing cCoerce: value to: cType ^cType = 'float' ifTrue: [value asIEEE32BitWord] ifFalse: [value] in FloatArrayPlugin & Matrix2x3Plugin and then address the issues in the BalloonEnginePlugin. See http://forum.world.st/Simulating-the-BalloonEnginePlugin-FloatArrayPlugin-a…" (#('FloatArrayPlugin' 'Matrix2x3Plugin') includes: pluginString) ifTrue: [self transcript show: ' ... defeated'. ^nil]. pluginString isEmpty ifTrue: [plugin := self] ifFalse: [plugins := InterpreterPlugin allSubclasses select: [:psc| psc moduleName asString = pluginString asString]. simulatorClasses := (plugins select: [:psc| psc simulatorClass notNil] thenCollect: [:psc| psc simulatorClass]) asSet. simulatorClasses isEmpty ifTrue: [self transcript show: ' ... not found'. ^nil]. simulatorClasses size > 1 ifTrue: [^self error: 'This won''t work...']. (plugins copyWithoutAll: simulatorClasses) notEmpty ifTrue: [plugins := plugins copyWithoutAll: simulatorClasses]. plugins size > 1 ifTrue: [self transcript show: '...multiple plugin classes; choosing ', plugins last name]. realPluginClass := plugins last. "hopefully lowest in the hierarchy..." plugin := simulatorClasses anyOne newFor: realPluginClass. plugin setInterpreter: objectMemory. "Ignore return value from setInterpreter" (plugin respondsTo: #initialiseModule) ifTrue: [plugin initialiseModule ifFalse: [self transcript show: ' ... initialiser failed'. ^nil]]]. "module initialiser failed" self transcript show: ' ... loaded'. objectMemory hasSpurMemoryManagerAPI ifTrue: [| realPlugin cg | self transcript show: '...computing accessor depths'. plugin class isPluginClass ifTrue: [realPlugin := (plugin isSmartSyntaxPluginSimulator ifTrue: [realPluginClass] ifFalse: [plugin class]) withAllSuperclasses detect: [:class| class shouldBeTranslated]. + cg := realPlugin buildCodeGenerator] - cg := realPlugin buildCodeGeneratorUpTo: realPlugin] ifFalse: [cg := self codeGeneratorToComputeAccessorDepth. primitiveTable withIndexDo: [:prim :index| | depth | prim isSymbol ifTrue: [depth := cg accessorDepthForSelector: prim. self assert: (depth isInteger or: [depth isNil and: [(plugin class whichClassIncludesSelector: prim) isNil]]). primitiveAccessorDepthTable at: index - 1 put: depth]]]. cg exportedPrimitiveNames do: [:primName| | fnSymbol | fnSymbol := primName asSymbol. pluginEntries addLast: {plugin. fnSymbol. [plugin perform: fnSymbol. self]. cg accessorDepthForSelector: fnSymbol}]. self transcript show: '...done']. ^pluginString asString -> plugin! Item was changed: ----- Method: SurfacePlugin class>>translateInDirectory:doInlining: (in category 'translation') ----- translateInDirectory: directory doInlining: inlineFlag "handle a special case external file rather than normal generated code." | cg | self initialize. + cg := self buildCodeGenerator. - cg := self buildCodeGeneratorUpTo: self. "We rely on the fake entry points implemented on the instance side to allow the export list to be accurate. Please update them if you change the code" ^cg exportedPrimitiveNames asArray!

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