Vm-dev September 2019

vm-dev@lists.squeakfoundation.org

21 participants
118 discussions

VM Maker: VMMaker.oscog-eem.2552.mcz
by commits＠source.squeak.org 05 Sep '19

05 Sep '19

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.2552.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.2552 Author: eem Time: 5 September 2019, 2:47:36.304555 pm UUID: ce35a940-f745-405c-8ecd-0f890493b657 Ancestors: VMMaker.oscog-eem.2551 And implement the primitiveDoMixedArithmetic accessor macro correctly for the interpreter-variables-in-struct regime. =============== Diff against VMMaker.oscog-eem.2551 =============== Item was changed: ----- Method: StackInterpreter>>primitiveDoMixedArithmetic (in category 'primitive support') ----- primitiveDoMixedArithmetic "If primitiveDoMixedArithmetic is true, then primitive can handle the conversions: SmallInteger arithmeticOp: Float (Small or Boxed) SmallInteger compareOp: Float (Small or Boxed) Else, the primitive fail in case of mixed arithmetic, and conversion should be performed at image side" <api> + <cmacro: '() GIV(primitiveDoMixedArithmetic)'> - <cmacro: '() primitiveDoMixedArithmetic'> ^primitiveDoMixedArithmetic!

1 0

VM Maker: VMMaker.oscog-eem.2551.mcz
by commits＠source.squeak.org 05 Sep '19

05 Sep '19

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.2551.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.2551 Author: eem Time: 5 September 2019, 2:42:22.994572 pm UUID: b12b3e65-a8cc-4579-900c-ebf69370c2b5 Ancestors: VMMaker.oscog-eem.2550, VMMaker.oscog-nice.2550 Since we have a macro for primitiveDoMixedArithmetic there is no need for the getPrimitiveDoMixedArithmetic accessor. Just mark primitiveDoMixedArithmetic qwith <api> and the code generator does the right thing (primitiveDoMixedArithmetic macro will be in cointerp.h). =============== Diff against VMMaker.oscog-eem.2550 =============== Item was removed: - ----- Method: CoInterpreter>>getPrimitiveDoMixedArithmetic (in category 'cog jit support') ----- - getPrimitiveDoMixedArithmetic - <api> - ^primitiveDoMixedArithmetic! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveEqual (in category 'primitive generators') ----- genPrimitiveEqual + ^coInterpreter primitiveDoMixedArithmetic - ^coInterpreter getPrimitiveDoMixedArithmetic ifTrue: [self genSmallIntegerComparison: JumpZero orDoubleComparison: #JumpFPEqual:] ifFalse: [self genSmallIntegerComparison: JumpZero]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveFloatAdd (in category 'primitive generators') ----- genPrimitiveFloatAdd <option: #DPFPReg0> + ^coInterpreter primitiveDoMixedArithmetic - ^coInterpreter getPrimitiveDoMixedArithmetic ifTrue: [self genDoubleArithmetic: AddRdRd preOpCheck: nil] ifFalse: [self genPureDoubleArithmetic: AddRdRd preOpCheck: nil]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveFloatDivide (in category 'primitive generators') ----- genPrimitiveFloatDivide <option: #DPFPReg0> + ^coInterpreter primitiveDoMixedArithmetic - ^coInterpreter getPrimitiveDoMixedArithmetic ifTrue: [self genDoubleArithmetic: DivRdRd preOpCheck: #genDoubleFailIfZeroArgRcvr:arg:] ifFalse: [self genPureDoubleArithmetic: DivRdRd preOpCheck: #genDoubleFailIfZeroArgRcvr:arg:]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveFloatEqual (in category 'primitive generators') ----- genPrimitiveFloatEqual <option: #DPFPReg0> + ^coInterpreter primitiveDoMixedArithmetic - ^coInterpreter getPrimitiveDoMixedArithmetic ifTrue: [self genDoubleComparison: #JumpFPEqual:] ifFalse: [self genPureDoubleComparison: #JumpFPEqual:]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveFloatGreaterOrEqual (in category 'primitive generators') ----- genPrimitiveFloatGreaterOrEqual <option: #DPFPReg0> + ^coInterpreter primitiveDoMixedArithmetic - ^coInterpreter getPrimitiveDoMixedArithmetic ifTrue: [self genDoubleComparison: #JumpFPGreaterOrEqual:] ifFalse: [self genPureDoubleComparison: #JumpFPGreaterOrEqual:]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveFloatGreaterThan (in category 'primitive generators') ----- genPrimitiveFloatGreaterThan <option: #DPFPReg0> + ^coInterpreter primitiveDoMixedArithmetic - ^coInterpreter getPrimitiveDoMixedArithmetic ifTrue: [self genDoubleComparison: #JumpFPGreater:] ifFalse: [self genPureDoubleComparison: #JumpFPGreater:]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveFloatLessOrEqual (in category 'primitive generators') ----- genPrimitiveFloatLessOrEqual <option: #DPFPReg0> + ^coInterpreter primitiveDoMixedArithmetic - ^coInterpreter getPrimitiveDoMixedArithmetic ifTrue: [self genDoubleComparison: #JumpFPLessOrEqual:] ifFalse: [self genPureDoubleComparison: #JumpFPLessOrEqual:]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveFloatLessThan (in category 'primitive generators') ----- genPrimitiveFloatLessThan <option: #DPFPReg0> + ^coInterpreter primitiveDoMixedArithmetic - ^coInterpreter getPrimitiveDoMixedArithmetic ifTrue: [self genDoubleComparison: #JumpFPLess:] ifFalse: [self genPureDoubleComparison: #JumpFPLess:]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveFloatMultiply (in category 'primitive generators') ----- genPrimitiveFloatMultiply <option: #DPFPReg0> + ^coInterpreter primitiveDoMixedArithmetic - ^coInterpreter getPrimitiveDoMixedArithmetic ifTrue: [self genDoubleArithmetic: MulRdRd preOpCheck: nil] ifFalse: [self genPureDoubleArithmetic: MulRdRd preOpCheck: nil]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveFloatNotEqual (in category 'primitive generators') ----- genPrimitiveFloatNotEqual <option: #DPFPReg0> + ^coInterpreter primitiveDoMixedArithmetic - ^coInterpreter getPrimitiveDoMixedArithmetic ifTrue: [self genDoubleComparison: #JumpFPNotEqual:] ifFalse: [self genPureDoubleComparison: #JumpFPNotEqual:]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveFloatSubtract (in category 'primitive generators') ----- genPrimitiveFloatSubtract <option: #DPFPReg0> + ^coInterpreter primitiveDoMixedArithmetic - ^coInterpreter getPrimitiveDoMixedArithmetic ifTrue: [self genDoubleArithmetic: SubRdRd preOpCheck: nil] ifFalse: [self genPureDoubleArithmetic: SubRdRd preOpCheck: nil]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveGreaterOrEqual (in category 'primitive generators') ----- genPrimitiveGreaterOrEqual + ^coInterpreter primitiveDoMixedArithmetic - ^coInterpreter getPrimitiveDoMixedArithmetic ifTrue: [self genSmallIntegerComparison: JumpGreaterOrEqual orDoubleComparison: #JumpFPGreaterOrEqual:] ifFalse: [self genSmallIntegerComparison: JumpGreaterOrEqual]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveGreaterThan (in category 'primitive generators') ----- genPrimitiveGreaterThan + ^coInterpreter primitiveDoMixedArithmetic - ^coInterpreter getPrimitiveDoMixedArithmetic ifTrue: [self genSmallIntegerComparison: JumpGreater orDoubleComparison: #JumpFPGreater:] ifFalse: [self genSmallIntegerComparison: JumpGreater]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveLessOrEqual (in category 'primitive generators') ----- genPrimitiveLessOrEqual + ^coInterpreter primitiveDoMixedArithmetic - ^coInterpreter getPrimitiveDoMixedArithmetic ifTrue: [self genSmallIntegerComparison: JumpLessOrEqual orDoubleComparison: #JumpFPLessOrEqual:] ifFalse: [self genSmallIntegerComparison: JumpLessOrEqual]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveLessThan (in category 'primitive generators') ----- genPrimitiveLessThan + ^coInterpreter primitiveDoMixedArithmetic - ^coInterpreter getPrimitiveDoMixedArithmetic ifTrue: [self genSmallIntegerComparison: JumpLess orDoubleComparison: #JumpFPLess:] ifFalse: [self genSmallIntegerComparison: JumpLess]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveNotEqual (in category 'primitive generators') ----- genPrimitiveNotEqual + ^coInterpreter primitiveDoMixedArithmetic - ^coInterpreter getPrimitiveDoMixedArithmetic ifTrue: [self genSmallIntegerComparison: JumpNonZero orDoubleComparison: #JumpFPNotEqual:] ifFalse: [self genSmallIntegerComparison: JumpNonZero]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveSmallFloatAdd (in category 'primitive generators') ----- genPrimitiveSmallFloatAdd <option: #Spur64BitMemoryManager> + ^coInterpreter primitiveDoMixedArithmetic - ^coInterpreter getPrimitiveDoMixedArithmetic ifTrue: [self genSmallFloatArithmetic: AddRdRd preOpCheck: nil] ifFalse: [self genPureSmallFloatArithmetic: AddRdRd preOpCheck: nil]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveSmallFloatDivide (in category 'primitive generators') ----- genPrimitiveSmallFloatDivide <option: #Spur64BitMemoryManager> + ^coInterpreter primitiveDoMixedArithmetic - ^coInterpreter getPrimitiveDoMixedArithmetic ifTrue: [self genSmallFloatArithmetic: DivRdRd preOpCheck: #genDoubleFailIfZeroArgRcvr:arg:] ifFalse: [self genPureSmallFloatArithmetic: DivRdRd preOpCheck: #genDoubleFailIfZeroArgRcvr:arg:]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveSmallFloatEqual (in category 'primitive generators') ----- genPrimitiveSmallFloatEqual <option: #Spur64BitMemoryManager> + ^coInterpreter primitiveDoMixedArithmetic - ^coInterpreter getPrimitiveDoMixedArithmetic ifTrue: [self genSmallFloatComparison: #JumpFPEqual: orIntegerComparison: JumpZero] ifFalse: [self genPureSmallFloatComparison: #JumpFPEqual:]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveSmallFloatGreaterOrEqual (in category 'primitive generators') ----- genPrimitiveSmallFloatGreaterOrEqual <option: #Spur64BitMemoryManager> + ^coInterpreter primitiveDoMixedArithmetic - ^coInterpreter getPrimitiveDoMixedArithmetic ifTrue: [self genSmallFloatComparison: #JumpFPGreaterOrEqual: orIntegerComparison: JumpGreaterOrEqual ] ifFalse: [self genPureSmallFloatComparison: #JumpFPGreaterOrEqual: ]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveSmallFloatGreaterThan (in category 'primitive generators') ----- genPrimitiveSmallFloatGreaterThan <option: #Spur64BitMemoryManager> + ^coInterpreter primitiveDoMixedArithmetic - ^coInterpreter getPrimitiveDoMixedArithmetic ifTrue: [self genSmallFloatComparison: #JumpFPGreater: orIntegerComparison: JumpGreater ] ifFalse: [self genPureSmallFloatComparison: #JumpFPGreater: ]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveSmallFloatLessOrEqual (in category 'primitive generators') ----- genPrimitiveSmallFloatLessOrEqual <option: #Spur64BitMemoryManager> + ^coInterpreter primitiveDoMixedArithmetic - ^coInterpreter getPrimitiveDoMixedArithmetic ifTrue: [self genSmallFloatComparison: #JumpFPLessOrEqual: orIntegerComparison: JumpLessOrEqual ] ifFalse: [self genPureSmallFloatComparison: #JumpFPLessOrEqual: ]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveSmallFloatLessThan (in category 'primitive generators') ----- genPrimitiveSmallFloatLessThan <option: #Spur64BitMemoryManager> + ^coInterpreter primitiveDoMixedArithmetic - ^coInterpreter getPrimitiveDoMixedArithmetic ifTrue: [self genSmallFloatComparison: #JumpFPLess: orIntegerComparison: JumpLess ] ifFalse: [self genPureSmallFloatComparison: #JumpFPLess: ]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveSmallFloatMultiply (in category 'primitive generators') ----- genPrimitiveSmallFloatMultiply <option: #Spur64BitMemoryManager> + ^coInterpreter primitiveDoMixedArithmetic - ^coInterpreter getPrimitiveDoMixedArithmetic ifTrue: [self genSmallFloatArithmetic: MulRdRd preOpCheck: nil] ifFalse: [self genPureSmallFloatArithmetic: MulRdRd preOpCheck: nil]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveSmallFloatNotEqual (in category 'primitive generators') ----- genPrimitiveSmallFloatNotEqual <option: #Spur64BitMemoryManager> + ^coInterpreter primitiveDoMixedArithmetic - ^coInterpreter getPrimitiveDoMixedArithmetic ifTrue: [self genSmallFloatComparison: #JumpFPNotEqual: orIntegerComparison: JumpNonZero] ifFalse: [self genPureSmallFloatComparison: #JumpFPNotEqual:]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveSmallFloatSubtract (in category 'primitive generators') ----- genPrimitiveSmallFloatSubtract <option: #Spur64BitMemoryManager> + ^coInterpreter primitiveDoMixedArithmetic - ^coInterpreter getPrimitiveDoMixedArithmetic ifTrue: [self genSmallFloatArithmetic: SubRdRd preOpCheck: nil] ifFalse: [self genPureSmallFloatArithmetic: SubRdRd preOpCheck: nil]! Item was changed: ----- Method: CogObjectRepresentationFor64BitSpur>>genPrimitiveFloatEqual (in category 'primitive generators') ----- genPrimitiveFloatEqual <option: #DPFPReg0> + ^coInterpreter primitiveDoMixedArithmetic - ^coInterpreter getPrimitiveDoMixedArithmetic ifTrue: [self genDoubleComparison: #JumpFPEqual: orIntegerComparison: JumpZero] ifFalse: [self genPureDoubleComparison: #JumpFPEqual:]! Item was changed: ----- Method: CogObjectRepresentationFor64BitSpur>>genPrimitiveFloatGreaterOrEqual (in category 'primitive generators') ----- genPrimitiveFloatGreaterOrEqual <option: #DPFPReg0> + ^coInterpreter primitiveDoMixedArithmetic - ^coInterpreter getPrimitiveDoMixedArithmetic ifTrue: [self genDoubleComparison: #JumpFPGreaterOrEqual: orIntegerComparison: JumpGreaterOrEqual] ifFalse: [self genPureDoubleComparison: #JumpFPGreaterOrEqual:]! Item was changed: ----- Method: CogObjectRepresentationFor64BitSpur>>genPrimitiveFloatGreaterThan (in category 'primitive generators') ----- genPrimitiveFloatGreaterThan <option: #DPFPReg0> + ^coInterpreter primitiveDoMixedArithmetic - ^coInterpreter getPrimitiveDoMixedArithmetic ifTrue: [self genDoubleComparison: #JumpFPGreater: orIntegerComparison: JumpGreater] ifFalse: [self genPureDoubleComparison: #JumpFPGreater:]! Item was changed: ----- Method: CogObjectRepresentationFor64BitSpur>>genPrimitiveFloatLessOrEqual (in category 'primitive generators') ----- genPrimitiveFloatLessOrEqual <option: #DPFPReg0> + ^coInterpreter primitiveDoMixedArithmetic - ^coInterpreter getPrimitiveDoMixedArithmetic ifTrue: [self genDoubleComparison: #JumpFPLessOrEqual: orIntegerComparison: JumpLessOrEqual] ifFalse: [self genPureDoubleComparison: #JumpFPLessOrEqual:]! Item was changed: ----- Method: CogObjectRepresentationFor64BitSpur>>genPrimitiveFloatLessThan (in category 'primitive generators') ----- genPrimitiveFloatLessThan <option: #DPFPReg0> + ^coInterpreter primitiveDoMixedArithmetic - ^coInterpreter getPrimitiveDoMixedArithmetic ifTrue: [self genDoubleComparison: #JumpFPLess: orIntegerComparison: JumpLess] ifFalse: [self genPureDoubleComparison: #JumpFPLess:]! Item was changed: ----- Method: CogObjectRepresentationFor64BitSpur>>genPrimitiveFloatNotEqual (in category 'primitive generators') ----- genPrimitiveFloatNotEqual <option: #DPFPReg0> + ^coInterpreter primitiveDoMixedArithmetic - ^coInterpreter getPrimitiveDoMixedArithmetic ifTrue: [self genDoubleComparison: #JumpFPNotEqual: orIntegerComparison: JumpNonZero] ifFalse: [self genPureDoubleComparison: #JumpFPNotEqual:]! Item was removed: - ----- Method: CurrentImageCoInterpreterFacade>>getPrimitiveDoMixedArithmetic (in category 'cog jit support') ----- - getPrimitiveDoMixedArithmetic - ^coInterpreter getPrimitiveDoMixedArithmetic ifNil: [true]! Item was added: + ----- Method: CurrentImageCoInterpreterFacade>>primitiveDoMixedArithmetic (in category 'cog jit support') ----- + primitiveDoMixedArithmetic + ^coInterpreter primitiveDoMixedArithmetic ifNil: [true]! Item was changed: ----- Method: StackInterpreter>>primitiveDoMixedArithmetic (in category 'primitive support') ----- primitiveDoMixedArithmetic "If primitiveDoMixedArithmetic is true, then primitive can handle the conversions: SmallInteger arithmeticOp: Float (Small or Boxed) SmallInteger compareOp: Float (Small or Boxed) Else, the primitive fail in case of mixed arithmetic, and conversion should be performed at image side" + <api> <cmacro: '() primitiveDoMixedArithmetic'> ^primitiveDoMixedArithmetic!

1 0

VM Maker: VMMaker.oscog-eem.2550.mcz
by commits＠source.squeak.org 05 Sep '19

05 Sep '19

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.2550.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.2550 Author: eem Time: 5 September 2019, 2:35:03.722412 pm UUID: ee7482ae-8091-4a50-8a5a-316fac3479b1 Ancestors: VMMaker.oscog-nice.2549 Simplify the recenty changed Interpreter{rimitives (small)float primitives to avoid using cppIf:; since the distinction between 32-bit and 64-bit VM versions is handled at generation time different VM sources are generated for each and hence cppIf: is neither needed nor appropriate. Set hasYoungReferrer via an accessor; this in anticipation of adding a cmHasLiteral bit that will be used in Spur to optimize post-become adding of methods to the YoungReferrer list and of literal variable access. Refactor method zone printing to provide summaries of the number of methods, and the number of methods on the young referrer and open pic lists. =============== Diff against VMMaker.oscog-nice.2549 =============== Item was changed: ----- Method: CogIA32Compiler>>generateCheckFeatures (in category 'feature detection') ----- generateCheckFeatures + <inline: true> cogit PushR: EDX; PushR: ECX; PushR: EBX; MoveCq: 1 R: EAX; gen: CPUID; MoveR: EDX R: EAX; PopR: EBX; PopR: ECX; PopR: EDX; RetN: 0! Item was changed: ----- Method: CogIA32Compiler>>generateCheckLZCNT (in category 'feature detection') ----- generateCheckLZCNT "to check is Leading Zero Count operation is present cf. MSVC builtin __lzcnt documentation The result will be in bit 5 of return value (in EAX)" + <inline: true> cogit PushR: EDX; PushR: ECX; PushR: EBX; MoveCq: 16r80000001 R: EAX; gen: CPUID; MoveR: ECX R: EAX; PopR: EBX; PopR: ECX; PopR: EDX; RetN: 0! Item was changed: ----- Method: CogIA32Compiler>>generateLowLevelTryLock: (in category 'multi-threading') ----- generateLowLevelTryLock: vmOwnerLockAddress "Generate a function that attempts to lock the vmOwnerLock and answers true if it succeeded." + <inline: true> vmOwnerLockAddress = 0 ifTrue: [cogit MoveCq: 1 R: EAX; RetN: 0. ^self]. cogit MoveCq: 1 R: EAX; gen: MFENCE; "make the XCHG globally consistent" gen: XCHGAwR operand: vmOwnerLockAddress operand: EAX; gen: SFENCE; "make the store globally visible" SubCq: 1 R: EAX; "Since we only ever set the lock to 1 or 0, subtracting 1 sets EAX to 0 if the lock was already locked and non-zero if it wasn't." RetN: 0! Item was changed: ----- Method: CogMethodZone>>printCogMethods (in category 'printing') ----- printCogMethods <api> <returnTypeC: #void> + self printCogMethodsSummarizing: false! - | cogMethod nm nc no nf nu | - <var: #cogMethod type: #'CogMethod *'> - nm := nc := no := nf := nu := 0. - cogMethod := coInterpreter cCoerceSimple: baseAddress to: #'CogMethod *'. - [cogMethod < self limitZony] whileTrue: - [coInterpreter printCogMethod: cogMethod. - cogMethod cmType - caseOf: { - [CMFree] -> [nf := nf + 1]. - [CMMethod] -> [nm := nm + 1]. - [CMClosedPIC] -> [nc := nc + 1]. - [CMOpenPIC] -> [no:= no+ 1] } - otherwise: [nu := nu + 1]. - cogMethod := self methodAfter: cogMethod]. - coInterpreter print: 'CMMethod '; printNum: nm; print: ' CMClosedPIC '; printNum: nc; print: ' CMOpenPIC '; printNum: no; print: ' CMFree '; printNum: nf. - nu > 0 ifTrue: - [coInterpreter print: ' UNKNOWN '; printNum: nu]. - coInterpreter print: ' total '; printNum: nm+nc+no+nf+nu; cr! Item was added: + ----- Method: CogMethodZone>>printCogMethodsSummarizing: (in category 'printing') ----- + printCogMethodsSummarizing: summarize + <inline: true> + | cogMethod nm nc no nf nu | + <var: #cogMethod type: #'CogMethod *'> + nm := nc := no := nf := nu := 0. + cogMethod := coInterpreter cCoerceSimple: baseAddress to: #'CogMethod *'. + [cogMethod < self limitZony] whileTrue: + [summarize ifFalse: + [coInterpreter printCogMethod: cogMethod]. + cogMethod cmType + caseOf: { + [CMFree] -> [nf := nf + 1]. + [CMMethod] -> [nm := nm + 1]. + [CMClosedPIC] -> [nc := nc + 1]. + [CMOpenPIC] -> [no:= no+ 1] } + otherwise: [nu := nu + 1]. + cogMethod := self methodAfter: cogMethod]. + coInterpreter print: 'CMMethod '; printNum: nm; print: ' CMClosedPIC '; printNum: nc; print: ' CMOpenPIC '; printNum: no; print: ' CMFree '; printNum: nf. + nu > 0 ifTrue: + [coInterpreter print: ' UNKNOWN '; printNum: nu]. + coInterpreter print: ' total '; printNum: nm+nc+no+nf+nu; cr! Item was changed: ----- Method: CogMethodZone>>printOpenPICList (in category 'accessing') ----- printOpenPICList <api> + ^self printOpenPICListSummarizing: false! - | n openPIC | - <var: #openPIC type: #'CogMethod *'> - n := 0. - openPIC := openPICList. - [openPIC == nil] whileFalse: - [n := n + 1. - coInterpreter printCogMethod: openPIC. - openPIC := self cCoerceSimple: openPIC nextOpenPIC to: #'CogMethod *']. - ^n! Item was added: + ----- Method: CogMethodZone>>printOpenPICListSummarizing: (in category 'accessing') ----- + printOpenPICListSummarizing: summarize + <inline: true> + | n openPIC | + <var: #openPIC type: #'CogMethod *'> + n := 0. + openPIC := openPICList. + [openPIC == nil] whileFalse: + [n := n + 1. + summarize ifFalse: + [coInterpreter printCogMethod: openPIC]. + openPIC := self cCoerceSimple: openPIC nextOpenPIC to: #'CogMethod *']. + summarize ifTrue: + [coInterpreter print: 'num open PICs '; printNum: n; cr]. + ^n! Item was added: + ----- Method: CogMethodZone>>summarizeZone (in category 'printing') ----- + summarizeZone + <doNotGenerate> + | pointer cogMethod ny nf nn | + <var: #cogMethod type: #'CogMethod *'> + self printCogMethodsSummarizing: true. + self printOpenPICListSummarizing: true. + ny := nf := nn := 0. + pointer := youngReferrers. + [pointer < limitAddress] whileTrue: + [cogMethod := coInterpreter cCoerceSimple: (objectMemory longAt: pointer) to: #'CogMethod *'. + cogMethod cmRefersToYoung ifTrue: + [ny := ny + 1]. + cogMethod cmType = CMFree ifTrue: + [nf := nf + 1]. + (cogMethod cmRefersToYoung or: [cogMethod cmType = CMFree]) ifFalse: + [nn := nn + 1]. + pointer := pointer + objectMemory wordSize]. + coInterpreter print: 'num free '; printNum: nf; print: ' num young '; printNum: ny; print: ' num neither '; printNum: nn; cr! Item was changed: ----- Method: CogX64Compiler>>generateCheckLZCNT (in category 'feature detection') ----- generateCheckLZCNT "to check is Leading Zero Count operation is present cf. MSVC builtin __lzcnt documentation The result will be in bit 5 of return value (in RAX)" + <inline: true> cogit PushR: RDX; PushR: RCX; PushR: RBX; MoveCq: 16r80000001 R: RAX; gen: CPUID; MoveR: RCX R: RAX; PopR: RBX; PopR: RCX; PopR: RDX; RetN: 0! Item was changed: ----- Method: Cogit>>annotate:objRef: (in category 'method map') ----- annotate: abstractInstruction objRef: anOop <var: #abstractInstruction type: #'AbstractInstruction *'> <returnTypeC: #'AbstractInstruction *'> (objectRepresentation shouldAnnotateObjectReference: anOop) ifTrue: [(objectMemory isYoungObject: anOop) ifTrue: + [self setHasYoungReferent: true]. - [hasYoungReferent := true]. abstractInstruction annotation: IsObjectReference]. ^abstractInstruction! Item was changed: ----- Method: Cogit>>compileCogFullBlockMethod: (in category 'compile abstract instructions') ----- compileCogFullBlockMethod: numCopied <returnTypeC: #'CogMethod *'> <option: #SistaV1BytecodeSet> | numBytecodes numBlocks numCleanBlocks result | + self setHasYoungReferent: (objectMemory isYoungObject: methodObj). - hasYoungReferent := (objectMemory isYoungObject: methodObj). methodOrBlockNumArgs := coInterpreter argumentCountOf: methodObj. inBlock := InFullBlock. postCompileHook := nil. maxLitIndex := -1. self assert: (coInterpreter primitiveIndexOf: methodObj) = 0. initialPC := coInterpreter startPCOfMethod: methodObj. "initial estimate. Actual endPC is determined in scanMethod." endPC := objectMemory numBytesOf: methodObj. numBytecodes := endPC - initialPC + 1. primitiveIndex := 0. self allocateOpcodes: (numBytecodes + 10) * self estimateOfAbstractOpcodesPerBytecodes bytecodes: numBytecodes ifFail: [^coInterpreter cCoerceSimple: MethodTooBig to: #'CogMethod *']. self flag: #TODO. "currently copiedValue access implies frameful method, this is suboptimal" (numBlocks := self scanMethod) < 0 ifTrue: [^coInterpreter cCoerceSimple: numBlocks to: #'CogMethod *']. self assert: numBlocks = 0. "blocks in full blocks are full blocks, they are not inlined." numCleanBlocks := self scanForCleanBlocks. self assert: numCleanBlocks = 0. "blocks in full blocks are full blocks, they are not inlined." self allocateBlockStarts: numBlocks + numCleanBlocks. blockCount := 0. numCleanBlocks > 0 ifTrue: [self addCleanBlockStarts]. (self maybeAllocAndInitCounters and: [self maybeAllocAndInitIRCs]) ifFalse: "Inaccurate error code, but it'll do. This will likely never fail." [^coInterpreter cCoerceSimple: InsufficientCodeSpace to: #'CogMethod *']. blockEntryLabel := nil. methodLabel dependent: nil. (result := self compileEntireFullBlockMethod: numCopied) < 0 ifTrue: [^coInterpreter cCoerceSimple: result to: #'CogMethod *']. ^self generateCogFullBlock! Item was changed: ----- Method: Cogit>>compileCogMethod: (in category 'compile abstract instructions') ----- compileCogMethod: selector <returnTypeC: #'CogMethod *'> | numBytecodes numBlocks numCleanBlocks result extra | + self setHasYoungReferent: ((objectMemory isYoungObject: methodObj) + or: [objectMemory isYoung: selector]). - hasYoungReferent := (objectMemory isYoungObject: methodObj) - or: [objectMemory isYoung: selector]. methodOrBlockNumArgs := coInterpreter argumentCountOf: methodObj. inBlock := 0. postCompileHook := nil. maxLitIndex := -1. extra := ((primitiveIndex := coInterpreter primitiveIndexOf: methodObj) > 0 and: [(coInterpreter isQuickPrimitiveIndex: primitiveIndex) not]) ifTrue: [30] ifFalse: [10]. initialPC := coInterpreter startPCOfMethod: methodObj. "initial estimate. Actual endPC is determined in scanMethod." endPC := (coInterpreter isQuickPrimitiveIndex: primitiveIndex) ifTrue: [initialPC - 1] ifFalse: [objectMemory numBytesOf: methodObj]. numBytecodes := endPC - initialPC + 1. self allocateOpcodes: (numBytecodes + extra) * self estimateOfAbstractOpcodesPerBytecodes bytecodes: numBytecodes ifFail: [^coInterpreter cCoerceSimple: MethodTooBig to: #'CogMethod *']. (numBlocks := self scanMethod) < 0 ifTrue: [^coInterpreter cCoerceSimple: numBlocks to: #'CogMethod *']. numCleanBlocks := self scanForCleanBlocks. self methodFoundInvalidPostScan ifTrue: [^coInterpreter cCoerceSimple: ShouldNotJIT to: #'CogMethod *']. self allocateBlockStarts: numBlocks + numCleanBlocks. blockCount := 0. numCleanBlocks > 0 ifTrue: [self addCleanBlockStarts]. (self maybeAllocAndInitCounters and: [self maybeAllocAndInitIRCs]) ifFalse: "Inaccurate error code, but it'll do. This will likely never fail." [^coInterpreter cCoerceSimple: InsufficientCodeSpace to: #'CogMethod *']. blockEntryLabel := nil. methodLabel dependent: nil. (result := self compileEntireMethod) < 0 ifTrue: [^coInterpreter cCoerceSimple: result to: #'CogMethod *']. ^self generateCogMethod: selector! Item was changed: ----- Method: Cogit>>genLoadInlineCacheWithSelector: (in category 'in-line cacheing') ----- genLoadInlineCacheWithSelector: selectorIndex "The in-line cache for a send is implemented as a constant load into ClassReg. We always use a 32-bit load, even in 64-bits. In the initial (unlinked) state the in-line cache is notionally loaded with the selector. But since in 64-bits an arbitrary selector oop won't fit in a 32-bit constant load, we instead load the cache with the selector's index, either into the literal frame of the current method, or into the special selector array. Negative values are 1-relative indices into the special selector array. When a send is linked, the load of the selector, or selector index, is overwritten with a load of the receiver's class, or class tag. Hence, the 64-bit VM is currently constrained to use class indices as cache tags. If out-of-line literals are used, distinct caches /must not/ share acche locations, for if they do, send cacheing will be confused by the sharing. Hence we use the MoveUniqueC32:R: instruction that will not share literal locations." | cacheValue | self assert: (selectorIndex < 0 ifTrue: [selectorIndex negated between: 1 and: self numSpecialSelectors] ifFalse: [selectorIndex between: 0 and: (objectMemory literalCountOf: methodObj) - 1]). self inlineCacheTagsAreIndexes ifTrue: [cacheValue := selectorIndex] ifFalse: [| selector | selector := selectorIndex < 0 ifTrue: [(coInterpreter specialSelector: -1 - selectorIndex)] ifFalse: [self getLiteral: selectorIndex]. self assert: (objectMemory addressCouldBeOop: selector). (objectMemory isYoung: selector) ifTrue: + [self setHasYoungReferent: true]. - [hasYoungReferent := true]. cacheValue := selector]. self MoveUniqueC32: cacheValue R: ClassReg! Item was changed: ----- Method: Cogit>>generateTrampolines (in category 'initialization') ----- generateTrampolines "Generate the run-time entries and exits at the base of the native code zone and update the base. Read the class-side method trampolines for documentation on the various trampolines" | methodZoneStart | methodZoneStart := methodZoneBase. methodLabel address: methodZoneStart. self allocateOpcodes: 80 bytecodes: 0. + self setHasYoungReferent: false. - hasYoungReferent := false. objectRepresentation maybeGenerateSelectorIndexDereferenceRoutine. self generateSendTrampolines. self generateMissAbortTrampolines. objectRepresentation generateObjectRepresentationTrampolines. self generateRunTimeTrampolines. NewspeakVM ifTrue: [self generateNewspeakRuntime]. SistaVM ifTrue: [self generateSistaRuntime]. self generateEnilopmarts. self generateTracingTrampolines. "finish up" self recordGeneratedRunTime: 'methodZoneBase' address: methodZoneBase. processor flushICacheFrom: methodZoneStart asUnsignedInteger to: methodZoneBase asUnsignedInteger! Item was changed: ----- Method: Cogit>>maybeGenerateCheckLZCNT (in category 'initialization') ----- maybeGenerateCheckLZCNT | startAddress | <inline: true> backEnd numCheckLZCNTOpcodes > 0 ifTrue: [self allocateOpcodes: backEnd numCheckLZCNTOpcodes bytecodes: 0. startAddress := methodZoneBase. + methodLabel address: startAddress. "for pc-relative MoveCq: 16r80000001 R: RAX;" backEnd generateCheckLZCNT. self outputInstructionsForGeneratedRuntimeAt: startAddress. self recordGeneratedRunTime: 'ceCheckLZCNTFunction' address: startAddress. ceCheckLZCNTFunction := self cCoerceSimple: startAddress to: #'usqIntptr_t (*)(void)']! Item was added: + ----- Method: Cogit>>setHasYoungReferent: (in category 'accessing') ----- + setHasYoungReferent: boolean + "Written this way to allow reak-pointing in the simulator." + <cmacro: '(b) (hasYoungReferent = (b))'> + boolean ifTrue: + [self halt]. + "(hasYoungReferent == false and: [boolean == true]) ifTrue: + [self halt]." + hasYoungReferent := boolean! Item was changed: ----- Method: InterpreterPrimitives>>primitiveHighBit (in category 'arithmetic integer primitives') ----- primitiveHighBit | integerReceiverOop leadingZeroCount highestBitZeroBased | integerReceiverOop := self stackTop. "Convert the receiver Oop to use a single tag bit" self numSmallIntegerTagBits > 1 ifTrue: [integerReceiverOop := (integerReceiverOop >>> (self numSmallIntegerTagBits-1) bitOr: 1)]. self cppIf: #'__GNUC__' defined ifTrue: ["Note: in gcc, result is undefined if input is zero (for compatibility with BSR fallback when no CLZ instruction available). but input is never zero because we pass the oop with tag bits set, so we are safe" objectMemory wordSize = 4 ifTrue: [leadingZeroCount := self __builtin_clz: integerReceiverOop] ifFalse: [leadingZeroCount := self __builtin_clzll: integerReceiverOop]. leadingZeroCount = 0 ifTrue: ["highBit is not defined for negative Integer" self primitiveFail] ifFalse: ["Nice bit trick: 1-based high-bit is (32 - clz) - 1 to account for tag bit. This is like two-complement - clz - 1 on 5 bits, or in other words a bit-invert operation clz ^16r1F" self pop: 1 thenPushInteger: (leadingZeroCount bitXor: (BytesPerWord * 8 - 1))]. ^self]. self cppIf: #'__GNUC__' defined not & (#'_MSC_VER' defined | #'__ICC' defined) ifTrue: ["In MSVC, _lzcnt and _lzcnt64 builtins do not fallback to BSR when not supported by CPU Instead of messing with __cpuid() we always use the BSR intrinsic" "Trick: we test the oop sign rather than the integerValue. Assume oop are signed (so far, they are, sqInt are signed)" integerReceiverOop < 0 ifTrue: [self primitiveFail] ifFalse: [ "Setting this variable is useless, but VMMaker will generate it at a worse place" highestBitZeroBased := 0. "We do not even test the return value, because integerReceiverOop is never zero" self cCode: [objectMemory wordSize = 4 ifTrue: [self _BitScanReverse: highestBitZeroBased address _: integerReceiverOop] ifFalse: [self _BitScanReverse64: highestBitZeroBased address _: integerReceiverOop]] inSmalltalk: [highestBitZeroBased := integerReceiverOop highBit - 1]. "thanks to the tag bit, the +1 operation for getting 1-based rank is not necessary" self pop: 1 thenPushInteger: highestBitZeroBased]. ^self]. self cppIf: #'__GNUC__' defined not & #'_MSC_VER' defined not & #'__ICC' defined not ifTrue: ["not gcc/clang, nor MSVC/ICC, you have to implement if your compiler provide useful builtins" + self cCode: + [self primitiveFail] + inSmalltalk: "Simulate so that the simulatror is closer to the actual VM" + [integerReceiverOop < 0 + ifTrue: [self primitiveFail] + ifFalse: [self pop: 1 thenPushInteger: integerReceiverOop highBit - 1]]]! - self primitiveFail].! Item was changed: ----- Method: InterpreterPrimitives>>primitiveSmallFloatEqual (in category 'arithmetic float primitives') ----- primitiveSmallFloatEqual <option: #Spur64BitMemoryManager> + | rcvr arg | - | rcvr arg intArg | <var: #rcvr type: #double> <var: #arg type: #double> rcvr := objectMemory smallFloatValueOf: (self stackValue: 1). arg := objectMemory loadFloatOrIntFrom: self stackTop. self successful ifTrue: + [(rcvr = arg + and: [objectMemory isIntegerObject: self stackTop]) + ifTrue: "Resolve case of ambiguity so as to have comparison of exact values" + [| intArg | + intArg := objectMemory integerValueOf: self stackTop. + self pop: 2 thenPushBool: rcvr asInteger = intArg] - [self cppIf: objectMemory wordSize > 4 - ifTrue: [((objectMemory isIntegerObject: self stackTop) and: [rcvr = arg]) - ifTrue: - ["Resolve case of ambiguity so as to have comparison of exact values" - intArg := objectMemory integerValueOf: self stackTop. - self pop: 2 thenPushBool: rcvr asInteger = intArg] - ifFalse: [self pop: 2 thenPushBool: rcvr = arg]] ifFalse: [self pop: 2 thenPushBool: rcvr = arg]]! Item was changed: ----- Method: InterpreterPrimitives>>primitiveSmallFloatGreaterOrEqual (in category 'arithmetic float primitives') ----- primitiveSmallFloatGreaterOrEqual <option: #Spur64BitMemoryManager> + | rcvr arg | - | rcvr arg intArg | <var: #rcvr type: #double> <var: #arg type: #double> rcvr := objectMemory smallFloatValueOf: (self stackValue: 1). arg := objectMemory loadFloatOrIntFrom: self stackTop. self successful ifTrue: + [(rcvr = arg + and: [objectMemory isIntegerObject: self stackTop]) + ifTrue: "Resolve case of ambiguity so as to have comparison of exact values" + [| intArg | + intArg := objectMemory integerValueOf: self stackTop. + self pop: 2 thenPushBool: rcvr asInteger >= intArg] - [self cppIf: objectMemory wordSize > 4 - ifTrue: [((objectMemory isIntegerObject: self stackTop) and: [rcvr = arg]) - ifTrue: - ["Resolve case of ambiguity so as to have comparison of exact values" - intArg := objectMemory integerValueOf: self stackTop. - self pop: 2 thenPushBool: rcvr asInteger >= intArg] - ifFalse: [self pop: 2 thenPushBool: rcvr >= arg]] ifFalse: [self pop: 2 thenPushBool: rcvr >= arg]]! Item was changed: ----- Method: InterpreterPrimitives>>primitiveSmallFloatGreaterThan (in category 'arithmetic float primitives') ----- primitiveSmallFloatGreaterThan <option: #Spur64BitMemoryManager> + | rcvr arg | - | rcvr arg intArg | <var: #rcvr type: #double> <var: #arg type: #double> rcvr := objectMemory smallFloatValueOf: (self stackValue: 1). arg := objectMemory loadFloatOrIntFrom: self stackTop. self successful ifTrue: + [(rcvr = arg + and: [objectMemory isIntegerObject: self stackTop]) + ifTrue: "Resolve case of ambiguity so as to have comparison of exact values" + [| intArg | + intArg := objectMemory integerValueOf: self stackTop. + self pop: 2 thenPushBool: rcvr asInteger > intArg] - [self cppIf: objectMemory wordSize > 4 - ifTrue: [((objectMemory isIntegerObject: self stackTop) and: [rcvr = arg]) - ifTrue: - ["Resolve case of ambiguity so as to have comparison of exact values" - intArg := objectMemory integerValueOf: self stackTop. - self pop: 2 thenPushBool: rcvr asInteger > intArg] - ifFalse: [self pop: 2 thenPushBool: rcvr > arg]] ifFalse: [self pop: 2 thenPushBool: rcvr > arg]]! Item was changed: ----- Method: InterpreterPrimitives>>primitiveSmallFloatLessOrEqual (in category 'arithmetic float primitives') ----- primitiveSmallFloatLessOrEqual <option: #Spur64BitMemoryManager> + | rcvr arg | - | rcvr arg intArg | <var: #rcvr type: #double> <var: #arg type: #double> rcvr := objectMemory smallFloatValueOf: (self stackValue: 1). arg := objectMemory loadFloatOrIntFrom: self stackTop. self successful ifTrue: + [(rcvr = arg + and: [objectMemory isIntegerObject: self stackTop]) + ifTrue: "Resolve case of ambiguity so as to have comparison of exact values" + [| intArg | + intArg := objectMemory integerValueOf: self stackTop. + self pop: 2 thenPushBool: rcvr asInteger <= intArg] - [self cppIf: objectMemory wordSize > 4 - ifTrue: [((objectMemory isIntegerObject: self stackTop) and: [rcvr = arg]) - ifTrue: - ["Resolve case of ambiguity so as to have comparison of exact values" - intArg := objectMemory integerValueOf: self stackTop. - self pop: 2 thenPushBool: rcvr asInteger <= intArg] - ifFalse: [self pop: 2 thenPushBool: rcvr <= arg]] ifFalse: [self pop: 2 thenPushBool: rcvr <= arg]]! Item was changed: ----- Method: InterpreterPrimitives>>primitiveSmallFloatLessThan (in category 'arithmetic float primitives') ----- primitiveSmallFloatLessThan <option: #Spur64BitMemoryManager> + | rcvr arg | - | rcvr arg intArg | <var: #rcvr type: #double> <var: #arg type: #double> rcvr := objectMemory smallFloatValueOf: (self stackValue: 1). arg := objectMemory loadFloatOrIntFrom: self stackTop. self successful ifTrue: + [(rcvr = arg + and: [objectMemory isIntegerObject: self stackTop]) + ifTrue: "Resolve case of ambiguity so as to have comparison of exact values" + [| intArg | + intArg := objectMemory integerValueOf: self stackTop. + self pop: 2 thenPushBool: rcvr asInteger < intArg] - [self cppIf: objectMemory wordSize > 4 - ifTrue: [((objectMemory isIntegerObject: self stackTop) and: [rcvr = arg]) - ifTrue: - ["Resolve case of ambiguity so as to have comparison of exact values" - intArg := objectMemory integerValueOf: self stackTop. - self pop: 2 thenPushBool: rcvr asInteger < intArg] - ifFalse: [self pop: 2 thenPushBool: rcvr < arg]] ifFalse: [self pop: 2 thenPushBool: rcvr < arg]]! Item was changed: ----- Method: InterpreterPrimitives>>primitiveSmallFloatNotEqual (in category 'arithmetic float primitives') ----- primitiveSmallFloatNotEqual <option: #Spur64BitMemoryManager> + | rcvr arg | - | rcvr arg intArg | <var: #rcvr type: #double> <var: #arg type: #double> rcvr := objectMemory smallFloatValueOf: (self stackValue: 1). arg := objectMemory loadFloatOrIntFrom: self stackTop. self successful ifTrue: + [(rcvr = arg + and: [objectMemory isIntegerObject: self stackTop]) + ifTrue: "Resolve case of ambiguity so as to have comparison of exact values" + [| intArg | + intArg := objectMemory integerValueOf: self stackTop. + self pop: 2 thenPushBool: (rcvr asInteger = intArg) not] - [self cppIf: objectMemory wordSize > 4 - ifTrue: [((objectMemory isIntegerObject: self stackTop) and: [rcvr = arg]) - ifTrue: ["Resolve case of ambiguity so as to have comparison of exact values" - intArg := objectMemory integerValueOf: self stackTop. - self pop: 2 thenPushBool: (rcvr asInteger = intArg) not] - ifFalse: [self pop: 2 thenPushBool: (rcvr = arg) not]] ifFalse: [self pop: 2 thenPushBool: (rcvr = arg) not]]! Item was changed: ----- Method: SimpleStackBasedCogit>>genNSSend:numArgs:depth:sendTable: (in category 'bytecode generators') ----- genNSSend: selectorIndex numArgs: numArgs depth: depth sendTable: sendTable <var: #sendTable type: #'sqInt *'> | selector nsSendCache | self assert: (selectorIndex between: 0 and: (objectMemory literalCountOf: methodObj) - 1). selector := self getLiteral: selectorIndex. self assert: (objectMemory addressCouldBeOop: selector). (objectMemory isYoung: selector) ifTrue: + [self setHasYoungReferent: true]. - [hasYoungReferent := true]. nsSendCache := theIRCs + (NumOopsPerNSC * objectMemory bytesPerOop * indexOfIRC). indexOfIRC := indexOfIRC + 1. self assert: (objectMemory isInOldSpace: nsSendCache). self initializeNSSendCache: nsSendCache selector: selector numArgs: numArgs depth: depth. "This leaves the method receiver on the stack, which might not be the implicit receiver. But the lookup trampoline will establish the on-stack receiver once it locates it." self marshallAbsentReceiverSendArguments: numArgs. "Load the cache last so it is a fixed distance from the call." self MoveUniqueCw: nsSendCache R: SendNumArgsReg. self CallNewspeakSend: (sendTable at: (numArgs min: NumSendTrampolines - 1)). self PushR: ReceiverResultReg. ^0! Item was changed: ----- Method: Spur32BitMemoryManager>>loadFloatOrIntFrom: (in category 'interpreter access') ----- loadFloatOrIntFrom: floatOrInt "If floatOrInt is an integer and we enable mixed arithmetic in primitives, then convert it to a C double float and return it. If it is a Float, then load its value and return it. Otherwise fail -- ie return with primErrorCode non-zero." <inline: true> <returnTypeC: #double> + (coInterpreter primitiveDoMixedArithmetic and: [self isIntegerObject: floatOrInt]) ifTrue: - (self primitiveDoMixedArithmetic and: [self isIntegerObject: floatOrInt]) ifTrue: [^(self integerValueOf: floatOrInt) asFloat]. ^self floatValueOf: floatOrInt! Item was changed: ----- Method: StackInterpreter>>primitiveFloatEqual:toArg: (in category 'comparison float primitives') ----- primitiveFloatEqual: rcvrOop toArg: argOop | rcvr arg | <var: #rcvr type: #double> <var: #arg type: #double> rcvr := objectMemory loadFloatOrIntFrom: rcvrOop. arg := objectMemory loadFloatOrIntFrom: argOop. + (objectMemory wordSize > 4 + and: [rcvr = arg]) ifTrue: + [(objectMemory isIntegerObject: argOop) ifTrue: "Resolve case of ambiguity so as to have comparison of exact values" + [^rcvr asInteger = (objectMemory integerValueOf: argOop)]. + (objectMemory isIntegerObject: rcvrOop) ifTrue: + ["Same when used from bytecodePrim... + note that rcvr and arg cannot be both integer (case is already handled)" + ^(objectMemory integerValueOf: rcvrOop) = arg asInteger]]. - self cppIf: objectMemory wordSize > 4 - ifTrue: [rcvr = arg - ifTrue: - [(objectMemory isIntegerObject: argOop) - ifTrue: - ["Resolve case of ambiguity so as to have comparison of exact values" - ^ rcvr asInteger = (objectMemory integerValueOf: argOop)] - ifFalse: [(objectMemory isIntegerObject: rcvrOop) - ifTrue: - ["Same when used from bytecodePrim... - note that rcvr and arg cannot be both integer (case is already handled)" - ^ (objectMemory integerValueOf: rcvrOop) = arg asInteger]]]]. ^rcvr = arg! Item was changed: ----- Method: StackInterpreter>>primitiveFloatGreater:thanArg: (in category 'comparison float primitives') ----- primitiveFloatGreater: rcvrOop thanArg: argOop | rcvr arg | <var: #rcvr type: #double> <var: #arg type: #double> rcvr := objectMemory loadFloatOrIntFrom: rcvrOop. arg := objectMemory loadFloatOrIntFrom: argOop. + (objectMemory wordSize > 4 + and: [rcvr = arg]) ifTrue: + [(objectMemory isIntegerObject: argOop) ifTrue: "Resolve case of ambiguity so as to have comparison of exact values" + [^rcvr asInteger > (objectMemory integerValueOf: argOop)]. + (objectMemory isIntegerObject: rcvrOop) ifTrue: + ["Same when used from bytecodePrim... + note that rcvr and arg cannot be both integer (case is already handled)" + ^(objectMemory integerValueOf: rcvrOop) > arg asInteger]]. - self cppIf: objectMemory wordSize > 4 - ifTrue: [rcvr = arg - ifTrue: - [(objectMemory isIntegerObject: argOop) - ifTrue: - ["Resolve case of ambiguity so as to have comparison of exact values" - ^ rcvr asInteger > (objectMemory integerValueOf: argOop)] - ifFalse: [(objectMemory isIntegerObject: rcvrOop) - ifTrue: - ["Same when used from bytecodePrim... - note that rcvr and arg cannot be both integer (case is already handled)" - ^ (objectMemory integerValueOf: rcvrOop) > arg asInteger]]]]. ^rcvr > arg! Item was changed: ----- Method: StackInterpreter>>primitiveFloatGreaterOrEqual:toArg: (in category 'comparison float primitives') ----- primitiveFloatGreaterOrEqual: rcvrOop toArg: argOop | rcvr arg | <var: #rcvr type: #double> <var: #arg type: #double> rcvr := objectMemory loadFloatOrIntFrom: rcvrOop. arg := objectMemory loadFloatOrIntFrom: argOop. + (objectMemory wordSize > 4 + and: [rcvr = arg]) ifTrue: + [(objectMemory isIntegerObject: argOop) ifTrue: "Resolve case of ambiguity so as to have comparison of exact values" + [^rcvr asInteger >= (objectMemory integerValueOf: argOop)]. + (objectMemory isIntegerObject: rcvrOop) ifTrue: + ["Same when used from bytecodePrim... + note that rcvr and arg cannot be both integer (case is already handled)" + ^(objectMemory integerValueOf: rcvrOop) >= arg asInteger]]. - self cppIf: objectMemory wordSize > 4 - ifTrue: [rcvr = arg - ifTrue: - [(objectMemory isIntegerObject: argOop) - ifTrue: - ["Resolve case of ambiguity so as to have comparison of exact values" - ^ rcvr asInteger >= (objectMemory integerValueOf: argOop)] - ifFalse: [(objectMemory isIntegerObject: rcvrOop) - ifTrue: - ["Same when used from bytecodePrim... - note that rcvr and arg cannot be both integer (case is already handled)" - ^ (objectMemory integerValueOf: rcvrOop) >= arg asInteger]]]]. ^rcvr >= arg! Item was changed: ----- Method: StackInterpreter>>primitiveFloatLess:thanArg: (in category 'comparison float primitives') ----- primitiveFloatLess: rcvrOop thanArg: argOop | rcvr arg | <var: #rcvr type: #double> <var: #arg type: #double> rcvr := objectMemory loadFloatOrIntFrom: rcvrOop. arg := objectMemory loadFloatOrIntFrom: argOop. + (objectMemory wordSize > 4 + and: [rcvr = arg]) ifTrue: + [(objectMemory isIntegerObject: argOop) ifTrue: "Resolve case of ambiguity so as to have comparison of exact values" + [^rcvr asInteger < (objectMemory integerValueOf: argOop)]. + (objectMemory isIntegerObject: rcvrOop) ifTrue: + ["Same when used from bytecodePrim... + note that rcvr and arg cannot be both integer (case is already handled)" + ^(objectMemory integerValueOf: rcvrOop) < arg asInteger]]. - self cppIf: objectMemory wordSize > 4 - ifTrue: [rcvr = arg - ifTrue: - [(objectMemory isIntegerObject: argOop) - ifTrue: - ["Resolve case of ambiguity so as to have comparison of exact values" - ^ rcvr asInteger < (objectMemory integerValueOf: argOop)] - ifFalse: [(objectMemory isIntegerObject: rcvrOop) - ifTrue: - ["Same when used from bytecodePrim... - note that rcvr and arg cannot be both integer (case is already handled)" - ^ (objectMemory integerValueOf: rcvrOop) < arg asInteger]]]]. ^rcvr < arg! Item was changed: ----- Method: StackInterpreter>>primitiveFloatLessOrEqual:toArg: (in category 'comparison float primitives') ----- primitiveFloatLessOrEqual: rcvrOop toArg: argOop | rcvr arg | <var: #rcvr type: #double> <var: #arg type: #double> rcvr := objectMemory loadFloatOrIntFrom: rcvrOop. arg := objectMemory loadFloatOrIntFrom: argOop. + (objectMemory wordSize > 4 + and: [rcvr = arg]) ifTrue: + [(objectMemory isIntegerObject: argOop) ifTrue: "Resolve case of ambiguity so as to have comparison of exact values" + [^rcvr asInteger <= (objectMemory integerValueOf: argOop)]. + (objectMemory isIntegerObject: rcvrOop) ifTrue: + ["Same when used from bytecodePrim... + note that rcvr and arg cannot be both integer (case is already handled)" + ^(objectMemory integerValueOf: rcvrOop) <= arg asInteger]]. - self cppIf: objectMemory wordSize > 4 - ifTrue: [rcvr = arg - ifTrue: - [(objectMemory isIntegerObject: argOop) - ifTrue: - ["Resolve case of ambiguity so as to have comparison of exact values" - ^ rcvr asInteger <= (objectMemory integerValueOf: argOop)] - ifFalse: [(objectMemory isIntegerObject: rcvrOop) - ifTrue: - ["Same when used from bytecodePrim... - note that rcvr and arg cannot be both integer (case is already handled)" - ^ (objectMemory integerValueOf: rcvrOop) <= arg asInteger]]]]. ^rcvr <= arg! Item was changed: ----- Method: StackToRegisterMappingCogit>>genNSSend:numArgs:depth:sendTable: (in category 'bytecode generators') ----- genNSSend: selectorIndex numArgs: numArgs depth: depth sendTable: sendTable <var: #sendTable type: #'sqInt *'> | selector nsSendCache | self assert: (selectorIndex between: 0 and: (objectMemory literalCountOf: methodObj) - 1). selector := self getLiteral: selectorIndex. self assert: (objectMemory addressCouldBeOop: selector). (objectMemory isYoung: selector) ifTrue: + [self setHasYoungReferent: true]. - [hasYoungReferent := true]. nsSendCache := theIRCs + (NumOopsPerNSC * objectMemory bytesPerOop * indexOfIRC). indexOfIRC := indexOfIRC + 1. self assert: (objectMemory isInOldSpace: nsSendCache). self initializeNSSendCache: nsSendCache selector: selector numArgs: numArgs depth: depth. self ssAllocateCallReg: SendNumArgsReg. "This may leave the method receiver on the stack, which might not be the implicit receiver. But the lookup trampoline will establish an on-stack receiver once it locates it." self marshallAbsentReceiverSendArguments: numArgs. "Load the cache last so it is a fixed distance from the call." self MoveUniqueCw: nsSendCache R: SendNumArgsReg. self CallNewspeakSend: (sendTable at: (numArgs min: NumSendTrampolines - 1)). self voidReceiverOptStatus. self ssPushRegister: ReceiverResultReg. ^0!

1 0

VM Maker: VMMaker.oscog-nice.2550.mcz
by commits＠source.squeak.org 05 Sep '19

05 Sep '19

Nicolas Cellier uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-nice.2550.mcz ==================== Summary ==================== Name: VMMaker.oscog-nice.2550 Author: nice Time: 5 September 2019, 11:32:10.856709 pm UUID: 030a2cfe-8bbc-421e-bf8f-b2e0696d4ff2 Ancestors: VMMaker.oscog-nice.2548 2 things: 1) fix generateCheckLZCNT on X64 because MoveCw:R: causes an assertion failure at startup (maxSize=7 < machineCodeSize=11) - I don't understand MoveCw:R:, use MoveCq:R: instead 2) be Simulator friendly by sending messages to objectMemory/coInterpreter/ or whoever shall understand Note that this commit replace VMMaker.oscog-nice.2540 which should be deleted Indeed, Float comparison are tricky: The operator < (jb jump below) test for the carry flag (CF) like a jc, but this carry flag is also set when comparison is unordered !!! So we must first test the case of unordered, which also set (PF) with a jp. This is not necessary when using operators > (above) we can just ja (whicj is a jnc, case of unordered will set the carry and thus answer false). By transforming < into >, we avoid a JP conditional jump. Clever! =============== Diff against VMMaker.oscog-nice.2548 =============== Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveEqual (in category 'primitive generators') ----- genPrimitiveEqual + ^coInterpreter getPrimitiveDoMixedArithmetic - ^self getPrimitiveDoMixedArithmetic ifTrue: [self genSmallIntegerComparison: JumpZero orDoubleComparison: #JumpFPEqual: invert: false] ifFalse: [self genSmallIntegerComparison: JumpZero]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveFloatAdd (in category 'primitive generators') ----- genPrimitiveFloatAdd <option: #DPFPReg0> + ^coInterpreter getPrimitiveDoMixedArithmetic - ^self getPrimitiveDoMixedArithmetic ifTrue: [self genDoubleArithmetic: AddRdRd preOpCheck: nil] ifFalse: [self genPureDoubleArithmetic: AddRdRd preOpCheck: nil]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveFloatDivide (in category 'primitive generators') ----- genPrimitiveFloatDivide <option: #DPFPReg0> + ^coInterpreter getPrimitiveDoMixedArithmetic - ^self getPrimitiveDoMixedArithmetic ifTrue: [self genDoubleArithmetic: DivRdRd preOpCheck: #genDoubleFailIfZeroArgRcvr:arg:] ifFalse: [self genPureDoubleArithmetic: DivRdRd preOpCheck: #genDoubleFailIfZeroArgRcvr:arg:]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveFloatEqual (in category 'primitive generators') ----- genPrimitiveFloatEqual <option: #DPFPReg0> + ^coInterpreter getPrimitiveDoMixedArithmetic - ^self getPrimitiveDoMixedArithmetic ifTrue: [self genDoubleComparison: #JumpFPEqual: invert: false] ifFalse: [self genPureDoubleComparison: #JumpFPEqual: invert: false]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveFloatGreaterOrEqual (in category 'primitive generators') ----- genPrimitiveFloatGreaterOrEqual <option: #DPFPReg0> + ^coInterpreter getPrimitiveDoMixedArithmetic - ^self getPrimitiveDoMixedArithmetic ifTrue: [self genDoubleComparison: #JumpFPGreaterOrEqual: invert: false] ifFalse: [self genPureDoubleComparison: #JumpFPGreaterOrEqual: invert: false]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveFloatGreaterThan (in category 'primitive generators') ----- genPrimitiveFloatGreaterThan <option: #DPFPReg0> + ^coInterpreter getPrimitiveDoMixedArithmetic - ^self getPrimitiveDoMixedArithmetic ifTrue: [self genDoubleComparison: #JumpFPGreater: invert: false] ifFalse: [self genPureDoubleComparison: #JumpFPGreater: invert: false]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveFloatLessOrEqual (in category 'primitive generators') ----- genPrimitiveFloatLessOrEqual <option: #DPFPReg0> + ^coInterpreter getPrimitiveDoMixedArithmetic - ^self getPrimitiveDoMixedArithmetic ifTrue: [self genDoubleComparison: #JumpFPGreaterOrEqual: invert: true] ifFalse: [self genPureDoubleComparison: #JumpFPGreaterOrEqual: invert: true]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveFloatLessThan (in category 'primitive generators') ----- genPrimitiveFloatLessThan <option: #DPFPReg0> + ^coInterpreter getPrimitiveDoMixedArithmetic - ^self getPrimitiveDoMixedArithmetic ifTrue: [self genDoubleComparison: #JumpFPGreater: invert: true] ifFalse: [self genPureDoubleComparison: #JumpFPGreater: invert: true]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveFloatMultiply (in category 'primitive generators') ----- genPrimitiveFloatMultiply <option: #DPFPReg0> + ^coInterpreter getPrimitiveDoMixedArithmetic - ^self getPrimitiveDoMixedArithmetic ifTrue: [self genDoubleArithmetic: MulRdRd preOpCheck: nil] ifFalse: [self genPureDoubleArithmetic: MulRdRd preOpCheck: nil]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveFloatNotEqual (in category 'primitive generators') ----- genPrimitiveFloatNotEqual <option: #DPFPReg0> + ^coInterpreter getPrimitiveDoMixedArithmetic - ^self getPrimitiveDoMixedArithmetic ifTrue: [self genDoubleComparison: #JumpFPNotEqual: invert: false] ifFalse: [self genPureDoubleComparison: #JumpFPNotEqual: invert: false]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveFloatSubtract (in category 'primitive generators') ----- genPrimitiveFloatSubtract <option: #DPFPReg0> + ^coInterpreter getPrimitiveDoMixedArithmetic - ^self getPrimitiveDoMixedArithmetic ifTrue: [self genDoubleArithmetic: SubRdRd preOpCheck: nil] ifFalse: [self genPureDoubleArithmetic: SubRdRd preOpCheck: nil]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveGreaterOrEqual (in category 'primitive generators') ----- genPrimitiveGreaterOrEqual + ^coInterpreter getPrimitiveDoMixedArithmetic - ^self getPrimitiveDoMixedArithmetic ifTrue: [self genSmallIntegerComparison: JumpGreaterOrEqual orDoubleComparison: #JumpFPGreaterOrEqual: invert: false] ifFalse: [self genSmallIntegerComparison: JumpGreaterOrEqual]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveGreaterThan (in category 'primitive generators') ----- genPrimitiveGreaterThan + ^coInterpreter getPrimitiveDoMixedArithmetic - ^self getPrimitiveDoMixedArithmetic ifTrue: [self genSmallIntegerComparison: JumpGreater orDoubleComparison: #JumpFPGreater: invert: false] ifFalse: [self genSmallIntegerComparison: JumpGreater]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveLessOrEqual (in category 'primitive generators') ----- genPrimitiveLessOrEqual + ^coInterpreter getPrimitiveDoMixedArithmetic - ^self getPrimitiveDoMixedArithmetic ifTrue: [self genSmallIntegerComparison: JumpLessOrEqual orDoubleComparison: #JumpFPGreaterOrEqual: invert: true] ifFalse: [self genSmallIntegerComparison: JumpLessOrEqual]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveLessThan (in category 'primitive generators') ----- genPrimitiveLessThan + ^coInterpreter getPrimitiveDoMixedArithmetic - ^self getPrimitiveDoMixedArithmetic ifTrue: [self genSmallIntegerComparison: JumpLess orDoubleComparison: #JumpFPGreater: invert: true] ifFalse: [self genSmallIntegerComparison: JumpLess]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveNotEqual (in category 'primitive generators') ----- genPrimitiveNotEqual + ^coInterpreter getPrimitiveDoMixedArithmetic - ^self getPrimitiveDoMixedArithmetic ifTrue: [self genSmallIntegerComparison: JumpNonZero orDoubleComparison: #JumpFPNotEqual: invert: false] ifFalse: [self genSmallIntegerComparison: JumpNonZero]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveSmallFloatAdd (in category 'primitive generators') ----- genPrimitiveSmallFloatAdd <option: #Spur64BitMemoryManager> + ^coInterpreter getPrimitiveDoMixedArithmetic - ^self getPrimitiveDoMixedArithmetic ifTrue: [self genSmallFloatArithmetic: AddRdRd preOpCheck: nil] ifFalse: [self genPureSmallFloatArithmetic: AddRdRd preOpCheck: nil]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveSmallFloatDivide (in category 'primitive generators') ----- genPrimitiveSmallFloatDivide <option: #Spur64BitMemoryManager> + ^coInterpreter getPrimitiveDoMixedArithmetic - ^self getPrimitiveDoMixedArithmetic ifTrue: [self genSmallFloatArithmetic: DivRdRd preOpCheck: #genDoubleFailIfZeroArgRcvr:arg:] ifFalse: [self genPureSmallFloatArithmetic: DivRdRd preOpCheck: #genDoubleFailIfZeroArgRcvr:arg:]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveSmallFloatEqual (in category 'primitive generators') ----- genPrimitiveSmallFloatEqual <option: #Spur64BitMemoryManager> + ^coInterpreter getPrimitiveDoMixedArithmetic - ^self getPrimitiveDoMixedArithmetic ifTrue: [self genSmallFloatComparison: #JumpFPEqual: orIntegerComparison: JumpZero invert: false] ifFalse: [self genPureSmallFloatComparison: #JumpFPEqual: invert: false]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveSmallFloatGreaterOrEqual (in category 'primitive generators') ----- genPrimitiveSmallFloatGreaterOrEqual <option: #Spur64BitMemoryManager> + ^coInterpreter getPrimitiveDoMixedArithmetic - ^self getPrimitiveDoMixedArithmetic ifTrue: [self genSmallFloatComparison: #JumpFPGreaterOrEqual: orIntegerComparison: JumpGreaterOrEqual invert: false] ifFalse: [self genPureSmallFloatComparison: #JumpFPGreaterOrEqual: invert: false]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveSmallFloatGreaterThan (in category 'primitive generators') ----- genPrimitiveSmallFloatGreaterThan <option: #Spur64BitMemoryManager> + ^coInterpreter getPrimitiveDoMixedArithmetic - ^self getPrimitiveDoMixedArithmetic ifTrue: [self genSmallFloatComparison: #JumpFPGreater: orIntegerComparison: JumpGreater invert: false] ifFalse: [self genPureSmallFloatComparison: #JumpFPGreater: invert: false]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveSmallFloatLessOrEqual (in category 'primitive generators') ----- genPrimitiveSmallFloatLessOrEqual <option: #Spur64BitMemoryManager> + ^coInterpreter getPrimitiveDoMixedArithmetic - ^self getPrimitiveDoMixedArithmetic ifTrue: [self genSmallFloatComparison: #JumpFPGreaterOrEqual: orIntegerComparison: JumpLessOrEqual invert: true] ifFalse: [self genPureSmallFloatComparison: #JumpFPGreaterOrEqual: invert: true]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveSmallFloatLessThan (in category 'primitive generators') ----- genPrimitiveSmallFloatLessThan <option: #Spur64BitMemoryManager> + ^coInterpreter getPrimitiveDoMixedArithmetic - ^self getPrimitiveDoMixedArithmetic ifTrue: [self genSmallFloatComparison: #JumpFPGreater: orIntegerComparison: JumpLess invert: true] ifFalse: [self genPureSmallFloatComparison: #JumpFPGreater: invert: true]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveSmallFloatMultiply (in category 'primitive generators') ----- genPrimitiveSmallFloatMultiply <option: #Spur64BitMemoryManager> + ^coInterpreter getPrimitiveDoMixedArithmetic - ^self getPrimitiveDoMixedArithmetic ifTrue: [self genSmallFloatArithmetic: MulRdRd preOpCheck: nil] ifFalse: [self genPureSmallFloatArithmetic: MulRdRd preOpCheck: nil]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveSmallFloatNotEqual (in category 'primitive generators') ----- genPrimitiveSmallFloatNotEqual <option: #Spur64BitMemoryManager> + ^coInterpreter getPrimitiveDoMixedArithmetic - ^self getPrimitiveDoMixedArithmetic ifTrue: [self genSmallFloatComparison: #JumpFPNotEqual: orIntegerComparison: JumpNonZero invert: false] ifFalse: [self genPureSmallFloatComparison: #JumpFPNotEqual: invert: false]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveSmallFloatSubtract (in category 'primitive generators') ----- genPrimitiveSmallFloatSubtract <option: #Spur64BitMemoryManager> + ^coInterpreter getPrimitiveDoMixedArithmetic - ^self getPrimitiveDoMixedArithmetic ifTrue: [self genSmallFloatArithmetic: SubRdRd preOpCheck: nil] ifFalse: [self genPureSmallFloatArithmetic: SubRdRd preOpCheck: nil]! Item was changed: ----- Method: CogObjectRepresentationFor64BitSpur>>genPrimitiveFloatEqual (in category 'primitive generators') ----- genPrimitiveFloatEqual <option: #DPFPReg0> + ^coInterpreter getPrimitiveDoMixedArithmetic - ^self getPrimitiveDoMixedArithmetic ifTrue: [self genDoubleComparison: #JumpFPEqual: orIntegerComparison: JumpZero invert: false] ifFalse: [self genPureDoubleComparison: #JumpFPEqual: invert: false]! Item was changed: ----- Method: CogObjectRepresentationFor64BitSpur>>genPrimitiveFloatGreaterOrEqual (in category 'primitive generators') ----- genPrimitiveFloatGreaterOrEqual <option: #DPFPReg0> + ^coInterpreter getPrimitiveDoMixedArithmetic - ^self getPrimitiveDoMixedArithmetic ifTrue: [self genDoubleComparison: #JumpFPGreaterOrEqual: orIntegerComparison: JumpGreaterOrEqual invert: false] ifFalse: [self genPureDoubleComparison: #JumpFPGreaterOrEqual: invert: false]! Item was changed: ----- Method: CogObjectRepresentationFor64BitSpur>>genPrimitiveFloatGreaterThan (in category 'primitive generators') ----- genPrimitiveFloatGreaterThan <option: #DPFPReg0> + ^coInterpreter getPrimitiveDoMixedArithmetic - ^self getPrimitiveDoMixedArithmetic ifTrue: [self genDoubleComparison: #JumpFPGreater: orIntegerComparison: JumpGreater invert: false] ifFalse: [self genPureDoubleComparison: #JumpFPGreater: invert: false]! Item was changed: ----- Method: CogObjectRepresentationFor64BitSpur>>genPrimitiveFloatLessOrEqual (in category 'primitive generators') ----- genPrimitiveFloatLessOrEqual <option: #DPFPReg0> + ^coInterpreter getPrimitiveDoMixedArithmetic - ^self getPrimitiveDoMixedArithmetic ifTrue: [self genDoubleComparison: #JumpFPGreaterOrEqual: orIntegerComparison: JumpLessOrEqual invert: true] ifFalse: [self genPureDoubleComparison: #JumpFPGreaterOrEqual: invert: true]! Item was changed: ----- Method: CogObjectRepresentationFor64BitSpur>>genPrimitiveFloatLessThan (in category 'primitive generators') ----- genPrimitiveFloatLessThan <option: #DPFPReg0> + ^coInterpreter getPrimitiveDoMixedArithmetic - ^self getPrimitiveDoMixedArithmetic ifTrue: [self genDoubleComparison: #JumpFPGreater: orIntegerComparison: JumpLess invert: true] ifFalse: [self genPureDoubleComparison: #JumpFPGreater: invert: true]! Item was changed: ----- Method: CogObjectRepresentationFor64BitSpur>>genPrimitiveFloatNotEqual (in category 'primitive generators') ----- genPrimitiveFloatNotEqual <option: #DPFPReg0> + ^coInterpreter getPrimitiveDoMixedArithmetic - ^self getPrimitiveDoMixedArithmetic ifTrue: [self genDoubleComparison: #JumpFPNotEqual: orIntegerComparison: JumpNonZero invert: false] ifFalse: [self genPureDoubleComparison: #JumpFPNotEqual: invert: false]! Item was changed: ----- Method: CogX64Compiler>>generateCheckLZCNT (in category 'feature detection') ----- generateCheckLZCNT "to check is Leading Zero Count operation is present cf. MSVC builtin __lzcnt documentation The result will be in bit 5 of return value (in RAX)" cogit PushR: RDX; PushR: RCX; PushR: RBX; + MoveCq: 16r80000001 R: RAX; - MoveCw: 16r80000001 R: RAX; gen: CPUID; MoveR: RCX R: RAX; PopR: RBX; PopR: RCX; PopR: RDX; RetN: 0! Item was changed: ----- Method: InterpreterPrimitives>>primitiveSmallFloatEqual (in category 'arithmetic float primitives') ----- primitiveSmallFloatEqual <option: #Spur64BitMemoryManager> | rcvr arg intArg | <var: #rcvr type: #double> <var: #arg type: #double> rcvr := objectMemory smallFloatValueOf: (self stackValue: 1). arg := objectMemory loadFloatOrIntFrom: self stackTop. self successful ifTrue: [self cppIf: objectMemory wordSize > 4 + ifTrue: [((objectMemory isIntegerObject: self stackTop) and: [rcvr = arg]) - ifTrue: [((self isIntegerObject: self stackTop) and: [rcvr = arg]) ifTrue: ["Resolve case of ambiguity so as to have comparison of exact values" + intArg := objectMemory integerValueOf: self stackTop. - intArg := self integerValueOf: self stackTop. self pop: 2 thenPushBool: rcvr asInteger = intArg] ifFalse: [self pop: 2 thenPushBool: rcvr = arg]] ifFalse: [self pop: 2 thenPushBool: rcvr = arg]]! Item was changed: ----- Method: InterpreterPrimitives>>primitiveSmallFloatGreaterOrEqual (in category 'arithmetic float primitives') ----- primitiveSmallFloatGreaterOrEqual <option: #Spur64BitMemoryManager> | rcvr arg intArg | <var: #rcvr type: #double> <var: #arg type: #double> rcvr := objectMemory smallFloatValueOf: (self stackValue: 1). arg := objectMemory loadFloatOrIntFrom: self stackTop. self successful ifTrue: [self cppIf: objectMemory wordSize > 4 + ifTrue: [((objectMemory isIntegerObject: self stackTop) and: [rcvr = arg]) - ifTrue: [((self isIntegerObject: self stackTop) and: [rcvr = arg]) ifTrue: ["Resolve case of ambiguity so as to have comparison of exact values" + intArg := objectMemory integerValueOf: self stackTop. - intArg := self integerValueOf: self stackTop. self pop: 2 thenPushBool: rcvr asInteger >= intArg] ifFalse: [self pop: 2 thenPushBool: rcvr >= arg]] ifFalse: [self pop: 2 thenPushBool: rcvr >= arg]]! Item was changed: ----- Method: InterpreterPrimitives>>primitiveSmallFloatGreaterThan (in category 'arithmetic float primitives') ----- primitiveSmallFloatGreaterThan <option: #Spur64BitMemoryManager> | rcvr arg intArg | <var: #rcvr type: #double> <var: #arg type: #double> rcvr := objectMemory smallFloatValueOf: (self stackValue: 1). arg := objectMemory loadFloatOrIntFrom: self stackTop. self successful ifTrue: [self cppIf: objectMemory wordSize > 4 + ifTrue: [((objectMemory isIntegerObject: self stackTop) and: [rcvr = arg]) - ifTrue: [((self isIntegerObject: self stackTop) and: [rcvr = arg]) ifTrue: ["Resolve case of ambiguity so as to have comparison of exact values" + intArg := objectMemory integerValueOf: self stackTop. - intArg := self integerValueOf: self stackTop. self pop: 2 thenPushBool: rcvr asInteger > intArg] ifFalse: [self pop: 2 thenPushBool: rcvr > arg]] ifFalse: [self pop: 2 thenPushBool: rcvr > arg]]! Item was changed: ----- Method: InterpreterPrimitives>>primitiveSmallFloatLessOrEqual (in category 'arithmetic float primitives') ----- primitiveSmallFloatLessOrEqual <option: #Spur64BitMemoryManager> | rcvr arg intArg | <var: #rcvr type: #double> <var: #arg type: #double> rcvr := objectMemory smallFloatValueOf: (self stackValue: 1). arg := objectMemory loadFloatOrIntFrom: self stackTop. self successful ifTrue: [self cppIf: objectMemory wordSize > 4 + ifTrue: [((objectMemory isIntegerObject: self stackTop) and: [rcvr = arg]) - ifTrue: [((self isIntegerObject: self stackTop) and: [rcvr = arg]) ifTrue: ["Resolve case of ambiguity so as to have comparison of exact values" + intArg := objectMemory integerValueOf: self stackTop. - intArg := self integerValueOf: self stackTop. self pop: 2 thenPushBool: rcvr asInteger <= intArg] ifFalse: [self pop: 2 thenPushBool: rcvr <= arg]] ifFalse: [self pop: 2 thenPushBool: rcvr <= arg]]! Item was changed: ----- Method: InterpreterPrimitives>>primitiveSmallFloatLessThan (in category 'arithmetic float primitives') ----- primitiveSmallFloatLessThan <option: #Spur64BitMemoryManager> | rcvr arg intArg | <var: #rcvr type: #double> <var: #arg type: #double> rcvr := objectMemory smallFloatValueOf: (self stackValue: 1). arg := objectMemory loadFloatOrIntFrom: self stackTop. self successful ifTrue: [self cppIf: objectMemory wordSize > 4 + ifTrue: [((objectMemory isIntegerObject: self stackTop) and: [rcvr = arg]) - ifTrue: [((self isIntegerObject: self stackTop) and: [rcvr = arg]) ifTrue: ["Resolve case of ambiguity so as to have comparison of exact values" + intArg := objectMemory integerValueOf: self stackTop. - intArg := self integerValueOf: self stackTop. self pop: 2 thenPushBool: rcvr asInteger < intArg] ifFalse: [self pop: 2 thenPushBool: rcvr < arg]] ifFalse: [self pop: 2 thenPushBool: rcvr < arg]]! Item was changed: ----- Method: InterpreterPrimitives>>primitiveSmallFloatNotEqual (in category 'arithmetic float primitives') ----- primitiveSmallFloatNotEqual <option: #Spur64BitMemoryManager> | rcvr arg intArg | <var: #rcvr type: #double> <var: #arg type: #double> rcvr := objectMemory smallFloatValueOf: (self stackValue: 1). arg := objectMemory loadFloatOrIntFrom: self stackTop. self successful ifTrue: [self cppIf: objectMemory wordSize > 4 + ifTrue: [((objectMemory isIntegerObject: self stackTop) and: [rcvr = arg]) - ifTrue: [((self isIntegerObject: self stackTop) and: [rcvr = arg]) ifTrue: ["Resolve case of ambiguity so as to have comparison of exact values" + intArg := objectMemory integerValueOf: self stackTop. - intArg := self integerValueOf: self stackTop. self pop: 2 thenPushBool: (rcvr asInteger = intArg) not] ifFalse: [self pop: 2 thenPushBool: (rcvr = arg) not]] ifFalse: [self pop: 2 thenPushBool: (rcvr = arg) not]]! Item was changed: ----- Method: Spur64BitMemoryManager>>loadFloatOrIntFrom: (in category 'interpreter access') ----- loadFloatOrIntFrom: floatOrIntOop "If floatOrInt is an integer and we enable mixed arithmetic in primitives, then convert it to a C double float and return it. If it is a Float, then load its value and return it. Otherwise fail -- ie return with primErrorCode non-zero." <inline: true> <returnTypeC: #double> | result tagBits | <var: #result type: #double> (tagBits := floatOrIntOop bitAnd: self tagMask) ~= 0 ifTrue: [tagBits = self smallFloatTag ifTrue: [^self smallFloatValueOf: floatOrIntOop]. + (coInterpreter primitiveDoMixedArithmetic and: [tagBits = self smallIntegerTag]) ifTrue: - (self primitiveDoMixedArithmetic and: [tagBits = self smallIntegerTag]) ifTrue: [^(self integerValueOf: floatOrIntOop) asFloat]] ifFalse: [(self classIndexOf: floatOrIntOop) = ClassFloatCompactIndex ifTrue: [self cCode: '' inSmalltalk: [result := Float new: 2]. self fetchFloatAt: floatOrIntOop + self baseHeaderSize into: result. ^result]]. coInterpreter primitiveFail. ^0.0! Item was changed: ----- Method: StackInterpreter>>primitiveFloatEqual:toArg: (in category 'comparison float primitives') ----- primitiveFloatEqual: rcvrOop toArg: argOop | rcvr arg | <var: #rcvr type: #double> <var: #arg type: #double> rcvr := objectMemory loadFloatOrIntFrom: rcvrOop. arg := objectMemory loadFloatOrIntFrom: argOop. self cppIf: objectMemory wordSize > 4 ifTrue: [rcvr = arg ifTrue: + [(objectMemory isIntegerObject: argOop) - [(self isIntegerObject: argOop) ifTrue: ["Resolve case of ambiguity so as to have comparison of exact values" + ^ rcvr asInteger = (objectMemory integerValueOf: argOop)] + ifFalse: [(objectMemory isIntegerObject: rcvrOop) - ^ rcvr asInteger = (self integerValueOf: argOop)] - ifFalse: [(self isIntegerObject: rcvrOop) ifTrue: ["Same when used from bytecodePrim... note that rcvr and arg cannot be both integer (case is already handled)" + ^ (objectMemory integerValueOf: rcvrOop) = arg asInteger]]]]. - ^ (self integerValueOf: rcvrOop) = arg asInteger]]]]. ^rcvr = arg! Item was changed: ----- Method: StackInterpreter>>primitiveFloatGreater:thanArg: (in category 'comparison float primitives') ----- primitiveFloatGreater: rcvrOop thanArg: argOop | rcvr arg | <var: #rcvr type: #double> <var: #arg type: #double> rcvr := objectMemory loadFloatOrIntFrom: rcvrOop. arg := objectMemory loadFloatOrIntFrom: argOop. self cppIf: objectMemory wordSize > 4 ifTrue: [rcvr = arg ifTrue: + [(objectMemory isIntegerObject: argOop) - [(self isIntegerObject: argOop) ifTrue: ["Resolve case of ambiguity so as to have comparison of exact values" + ^ rcvr asInteger > (objectMemory integerValueOf: argOop)] + ifFalse: [(objectMemory isIntegerObject: rcvrOop) - ^ rcvr asInteger > (self integerValueOf: argOop)] - ifFalse: [(self isIntegerObject: rcvrOop) ifTrue: ["Same when used from bytecodePrim... note that rcvr and arg cannot be both integer (case is already handled)" + ^ (objectMemory integerValueOf: rcvrOop) > arg asInteger]]]]. - ^ (self integerValueOf: rcvrOop) > arg asInteger]]]]. ^rcvr > arg! Item was changed: ----- Method: StackInterpreter>>primitiveFloatGreaterOrEqual:toArg: (in category 'comparison float primitives') ----- primitiveFloatGreaterOrEqual: rcvrOop toArg: argOop | rcvr arg | <var: #rcvr type: #double> <var: #arg type: #double> rcvr := objectMemory loadFloatOrIntFrom: rcvrOop. arg := objectMemory loadFloatOrIntFrom: argOop. self cppIf: objectMemory wordSize > 4 ifTrue: [rcvr = arg ifTrue: + [(objectMemory isIntegerObject: argOop) - [(self isIntegerObject: argOop) ifTrue: ["Resolve case of ambiguity so as to have comparison of exact values" + ^ rcvr asInteger >= (objectMemory integerValueOf: argOop)] + ifFalse: [(objectMemory isIntegerObject: rcvrOop) - ^ rcvr asInteger >= (self integerValueOf: argOop)] - ifFalse: [(self isIntegerObject: rcvrOop) ifTrue: ["Same when used from bytecodePrim... note that rcvr and arg cannot be both integer (case is already handled)" + ^ (objectMemory integerValueOf: rcvrOop) >= arg asInteger]]]]. - ^ (self integerValueOf: rcvrOop) >= arg asInteger]]]]. ^rcvr >= arg! Item was changed: ----- Method: StackInterpreter>>primitiveFloatLess:thanArg: (in category 'comparison float primitives') ----- primitiveFloatLess: rcvrOop thanArg: argOop | rcvr arg | <var: #rcvr type: #double> <var: #arg type: #double> rcvr := objectMemory loadFloatOrIntFrom: rcvrOop. arg := objectMemory loadFloatOrIntFrom: argOop. self cppIf: objectMemory wordSize > 4 ifTrue: [rcvr = arg ifTrue: + [(objectMemory isIntegerObject: argOop) - [(self isIntegerObject: argOop) ifTrue: ["Resolve case of ambiguity so as to have comparison of exact values" + ^ rcvr asInteger < (objectMemory integerValueOf: argOop)] + ifFalse: [(objectMemory isIntegerObject: rcvrOop) - ^ rcvr asInteger < (self integerValueOf: argOop)] - ifFalse: [(self isIntegerObject: rcvrOop) ifTrue: ["Same when used from bytecodePrim... note that rcvr and arg cannot be both integer (case is already handled)" + ^ (objectMemory integerValueOf: rcvrOop) < arg asInteger]]]]. - ^ (self integerValueOf: rcvrOop) < arg asInteger]]]]. ^rcvr < arg! Item was changed: ----- Method: StackInterpreter>>primitiveFloatLessOrEqual:toArg: (in category 'comparison float primitives') ----- primitiveFloatLessOrEqual: rcvrOop toArg: argOop | rcvr arg | <var: #rcvr type: #double> <var: #arg type: #double> rcvr := objectMemory loadFloatOrIntFrom: rcvrOop. arg := objectMemory loadFloatOrIntFrom: argOop. self cppIf: objectMemory wordSize > 4 ifTrue: [rcvr = arg ifTrue: + [(objectMemory isIntegerObject: argOop) - [(self isIntegerObject: argOop) ifTrue: ["Resolve case of ambiguity so as to have comparison of exact values" + ^ rcvr asInteger <= (objectMemory integerValueOf: argOop)] + ifFalse: [(objectMemory isIntegerObject: rcvrOop) - ^ rcvr asInteger <= (self integerValueOf: argOop)] - ifFalse: [(self isIntegerObject: rcvrOop) ifTrue: ["Same when used from bytecodePrim... note that rcvr and arg cannot be both integer (case is already handled)" + ^ (objectMemory integerValueOf: rcvrOop) <= arg asInteger]]]]. - ^ (self integerValueOf: rcvrOop) <= arg asInteger]]]]. ^rcvr <= arg!

1 0

VM Maker: VMMaker.oscog-nice.2549.mcz
by commits＠source.squeak.org 05 Sep '19

05 Sep '19

Nicolas Cellier uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-nice.2549.mcz ==================== Summary ==================== Name: VMMaker.oscog-nice.2549 Author: nice Time: 5 September 2019, 9:51:10.740962 pm UUID: a70fa0be-4c3b-4080-a1f9-ac21d2e5bbea Ancestors: VMMaker.oscog-nice.2548 3 things: 1) fix generateCheckLZCNT on X64 because MoveCw:R: causes an assertion failure at startup (maxSize=7 < machineCodeSize=11) - I don't understand MoveCw:R:, use MoveCq:R: instead 2) nuke the invert: argument in Float comparison primitives. We have all the necessary instruction for > >= < <= so no use to play with negations 3) be Simulator fiendly by sending messages to objectMemory/coInterpreter/ or whoever =============== Diff against VMMaker.oscog-nice.2548 =============== Item was added: + ----- Method: CogObjectRepresentation>>genDoubleComparison: (in category 'primitive generators') ----- + genDoubleComparison: jumpOpcodeGenerator + <option: #DPFPReg0> + <var: #jumpOpcodeGenerator declareC: 'AbstractInstruction * NoDbgRegParms (*jumpOpcodeGenerator)(void *)'> + | jumpFail jumpImmediate jumpNonInt jumpCond compare | + <var: #jumpImmediate type: #'AbstractInstruction *'> + <var: #jumpNonInt type: #'AbstractInstruction *'> + <var: #jumpCond type: #'AbstractInstruction *'> + <var: #compare type: #'AbstractInstruction *'> + <var: #jumpFail type: #'AbstractInstruction *'> + cogit processorHasDoublePrecisionFloatingPointSupport ifFalse: + [^UnimplementedPrimitive]. + cogit genLoadArgAtDepth: 0 into: Arg0Reg. + self genGetDoubleValueOf: ReceiverResultReg into: DPFPReg0. + jumpImmediate := self genJumpImmediate: Arg0Reg. + self genGetCompactClassIndexNonImmOf: Arg0Reg into: SendNumArgsReg. + self genCmpClassFloatCompactIndexR: SendNumArgsReg. + jumpFail := cogit JumpNonZero: 0. + self genGetDoubleValueOf: Arg0Reg into: DPFPReg1. + compare := cogit CmpRd: DPFPReg1 Rd: DPFPReg0. + jumpCond := cogit perform: jumpOpcodeGenerator with: 0. "FP jumps are a little weird" + cogit genMoveFalseR: ReceiverResultReg. + cogit genPrimReturn. + jumpCond jmpTarget: (cogit genMoveTrueR: ReceiverResultReg). + cogit genPrimReturn. + jumpImmediate jmpTarget: cogit Label. + self maybeGenConvertIfSmallFloatIn: Arg0Reg scratchReg: TempReg into: DPFPReg1 andJumpTo: compare. + self smallIntegerIsOnlyImmediateType ifFalse: + [jumpNonInt := self genJumpNotSmallInteger: Arg0Reg scratchReg: TempReg]. + self genConvertSmallIntegerToIntegerInReg: Arg0Reg. + cogit ConvertR: Arg0Reg Rd: DPFPReg1. + cogit Jump: compare. + jumpFail jmpTarget: cogit Label. + self smallIntegerIsOnlyImmediateType ifFalse: + [jumpNonInt jmpTarget: jumpFail getJmpTarget]. + ^CompletePrimitive! Item was removed: - ----- Method: CogObjectRepresentation>>genDoubleComparison:invert: (in category 'primitive generators') ----- - genDoubleComparison: jumpOpcodeGenerator invert: invertComparison - <option: #DPFPReg0> - <var: #jumpOpcodeGenerator declareC: 'AbstractInstruction * NoDbgRegParms (*jumpOpcodeGenerator)(void *)'> - | jumpFail jumpImmediate jumpNonInt jumpCond compare | - <var: #jumpImmediate type: #'AbstractInstruction *'> - <var: #jumpNonInt type: #'AbstractInstruction *'> - <var: #jumpCond type: #'AbstractInstruction *'> - <var: #compare type: #'AbstractInstruction *'> - <var: #jumpFail type: #'AbstractInstruction *'> - cogit processorHasDoublePrecisionFloatingPointSupport ifFalse: - [^UnimplementedPrimitive]. - cogit genLoadArgAtDepth: 0 into: Arg0Reg. - self genGetDoubleValueOf: ReceiverResultReg into: DPFPReg0. - jumpImmediate := self genJumpImmediate: Arg0Reg. - self genGetCompactClassIndexNonImmOf: Arg0Reg into: SendNumArgsReg. - self genCmpClassFloatCompactIndexR: SendNumArgsReg. - jumpFail := cogit JumpNonZero: 0. - self genGetDoubleValueOf: Arg0Reg into: DPFPReg1. - invertComparison "May need to invert for NaNs" - ifTrue: [compare := cogit CmpRd: DPFPReg0 Rd: DPFPReg1] - ifFalse: [compare := cogit CmpRd: DPFPReg1 Rd: DPFPReg0]. - jumpCond := cogit perform: jumpOpcodeGenerator with: 0. "FP jumps are a little weird" - cogit genMoveFalseR: ReceiverResultReg. - cogit genPrimReturn. - jumpCond jmpTarget: (cogit genMoveTrueR: ReceiverResultReg). - cogit genPrimReturn. - jumpImmediate jmpTarget: cogit Label. - self maybeGenConvertIfSmallFloatIn: Arg0Reg scratchReg: TempReg into: DPFPReg1 andJumpTo: compare. - self smallIntegerIsOnlyImmediateType ifFalse: - [jumpNonInt := self genJumpNotSmallInteger: Arg0Reg scratchReg: TempReg]. - self genConvertSmallIntegerToIntegerInReg: Arg0Reg. - cogit ConvertR: Arg0Reg Rd: DPFPReg1. - cogit Jump: compare. - jumpFail jmpTarget: cogit Label. - self smallIntegerIsOnlyImmediateType ifFalse: - [jumpNonInt jmpTarget: jumpFail getJmpTarget]. - ^CompletePrimitive! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveEqual (in category 'primitive generators') ----- genPrimitiveEqual + ^coInterpreter getPrimitiveDoMixedArithmetic - ^self getPrimitiveDoMixedArithmetic ifTrue: [self genSmallIntegerComparison: JumpZero + orDoubleComparison: #JumpFPEqual:] - orDoubleComparison: #JumpFPEqual: - invert: false] ifFalse: [self genSmallIntegerComparison: JumpZero]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveFloatAdd (in category 'primitive generators') ----- genPrimitiveFloatAdd <option: #DPFPReg0> + ^coInterpreter getPrimitiveDoMixedArithmetic - ^self getPrimitiveDoMixedArithmetic ifTrue: [self genDoubleArithmetic: AddRdRd preOpCheck: nil] ifFalse: [self genPureDoubleArithmetic: AddRdRd preOpCheck: nil]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveFloatDivide (in category 'primitive generators') ----- genPrimitiveFloatDivide <option: #DPFPReg0> + ^coInterpreter getPrimitiveDoMixedArithmetic - ^self getPrimitiveDoMixedArithmetic ifTrue: [self genDoubleArithmetic: DivRdRd preOpCheck: #genDoubleFailIfZeroArgRcvr:arg:] ifFalse: [self genPureDoubleArithmetic: DivRdRd preOpCheck: #genDoubleFailIfZeroArgRcvr:arg:]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveFloatEqual (in category 'primitive generators') ----- genPrimitiveFloatEqual <option: #DPFPReg0> + ^coInterpreter getPrimitiveDoMixedArithmetic + ifTrue: [self genDoubleComparison: #JumpFPEqual:] + ifFalse: [self genPureDoubleComparison: #JumpFPEqual:]! - ^self getPrimitiveDoMixedArithmetic - ifTrue: [self genDoubleComparison: #JumpFPEqual: invert: false] - ifFalse: [self genPureDoubleComparison: #JumpFPEqual: invert: false]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveFloatGreaterOrEqual (in category 'primitive generators') ----- genPrimitiveFloatGreaterOrEqual <option: #DPFPReg0> + ^coInterpreter getPrimitiveDoMixedArithmetic + ifTrue: [self genDoubleComparison: #JumpFPGreaterOrEqual:] + ifFalse: [self genPureDoubleComparison: #JumpFPGreaterOrEqual:]! - ^self getPrimitiveDoMixedArithmetic - ifTrue: [self genDoubleComparison: #JumpFPGreaterOrEqual: invert: false] - ifFalse: [self genPureDoubleComparison: #JumpFPGreaterOrEqual: invert: false]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveFloatGreaterThan (in category 'primitive generators') ----- genPrimitiveFloatGreaterThan <option: #DPFPReg0> + ^coInterpreter getPrimitiveDoMixedArithmetic + ifTrue: [self genDoubleComparison: #JumpFPGreater:] + ifFalse: [self genPureDoubleComparison: #JumpFPGreater:]! - ^self getPrimitiveDoMixedArithmetic - ifTrue: [self genDoubleComparison: #JumpFPGreater: invert: false] - ifFalse: [self genPureDoubleComparison: #JumpFPGreater: invert: false]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveFloatLessOrEqual (in category 'primitive generators') ----- genPrimitiveFloatLessOrEqual <option: #DPFPReg0> + ^coInterpreter getPrimitiveDoMixedArithmetic + ifTrue: [self genDoubleComparison: #JumpFPLessOrEqual:] + ifFalse: [self genPureDoubleComparison: #JumpFPLessOrEqual:]! - ^self getPrimitiveDoMixedArithmetic - ifTrue: [self genDoubleComparison: #JumpFPGreaterOrEqual: invert: true] - ifFalse: [self genPureDoubleComparison: #JumpFPGreaterOrEqual: invert: true]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveFloatLessThan (in category 'primitive generators') ----- genPrimitiveFloatLessThan <option: #DPFPReg0> + ^coInterpreter getPrimitiveDoMixedArithmetic + ifTrue: [self genDoubleComparison: #JumpFPLess:] + ifFalse: [self genPureDoubleComparison: #JumpFPLess:]! - ^self getPrimitiveDoMixedArithmetic - ifTrue: [self genDoubleComparison: #JumpFPGreater: invert: true] - ifFalse: [self genPureDoubleComparison: #JumpFPGreater: invert: true]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveFloatMultiply (in category 'primitive generators') ----- genPrimitiveFloatMultiply <option: #DPFPReg0> + ^coInterpreter getPrimitiveDoMixedArithmetic - ^self getPrimitiveDoMixedArithmetic ifTrue: [self genDoubleArithmetic: MulRdRd preOpCheck: nil] ifFalse: [self genPureDoubleArithmetic: MulRdRd preOpCheck: nil]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveFloatNotEqual (in category 'primitive generators') ----- genPrimitiveFloatNotEqual <option: #DPFPReg0> + ^coInterpreter getPrimitiveDoMixedArithmetic + ifTrue: [self genDoubleComparison: #JumpFPNotEqual:] + ifFalse: [self genPureDoubleComparison: #JumpFPNotEqual:]! - ^self getPrimitiveDoMixedArithmetic - ifTrue: [self genDoubleComparison: #JumpFPNotEqual: invert: false] - ifFalse: [self genPureDoubleComparison: #JumpFPNotEqual: invert: false]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveFloatSubtract (in category 'primitive generators') ----- genPrimitiveFloatSubtract <option: #DPFPReg0> + ^coInterpreter getPrimitiveDoMixedArithmetic - ^self getPrimitiveDoMixedArithmetic ifTrue: [self genDoubleArithmetic: SubRdRd preOpCheck: nil] ifFalse: [self genPureDoubleArithmetic: SubRdRd preOpCheck: nil]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveGreaterOrEqual (in category 'primitive generators') ----- genPrimitiveGreaterOrEqual + ^coInterpreter getPrimitiveDoMixedArithmetic - ^self getPrimitiveDoMixedArithmetic ifTrue: [self genSmallIntegerComparison: JumpGreaterOrEqual + orDoubleComparison: #JumpFPGreaterOrEqual:] - orDoubleComparison: #JumpFPGreaterOrEqual: - invert: false] ifFalse: [self genSmallIntegerComparison: JumpGreaterOrEqual]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveGreaterThan (in category 'primitive generators') ----- genPrimitiveGreaterThan + ^coInterpreter getPrimitiveDoMixedArithmetic - ^self getPrimitiveDoMixedArithmetic ifTrue: [self genSmallIntegerComparison: JumpGreater + orDoubleComparison: #JumpFPGreater:] - orDoubleComparison: #JumpFPGreater: - invert: false] ifFalse: [self genSmallIntegerComparison: JumpGreater]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveLessOrEqual (in category 'primitive generators') ----- genPrimitiveLessOrEqual + ^coInterpreter getPrimitiveDoMixedArithmetic - ^self getPrimitiveDoMixedArithmetic ifTrue: [self genSmallIntegerComparison: JumpLessOrEqual + orDoubleComparison: #JumpFPLessOrEqual:] - orDoubleComparison: #JumpFPGreaterOrEqual: - invert: true] ifFalse: [self genSmallIntegerComparison: JumpLessOrEqual]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveLessThan (in category 'primitive generators') ----- genPrimitiveLessThan + ^coInterpreter getPrimitiveDoMixedArithmetic - ^self getPrimitiveDoMixedArithmetic ifTrue: [self genSmallIntegerComparison: JumpLess + orDoubleComparison: #JumpFPLess:] - orDoubleComparison: #JumpFPGreater: - invert: true] ifFalse: [self genSmallIntegerComparison: JumpLess]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveNotEqual (in category 'primitive generators') ----- genPrimitiveNotEqual + ^coInterpreter getPrimitiveDoMixedArithmetic - ^self getPrimitiveDoMixedArithmetic ifTrue: [self genSmallIntegerComparison: JumpNonZero + orDoubleComparison: #JumpFPNotEqual:] - orDoubleComparison: #JumpFPNotEqual: - invert: false] ifFalse: [self genSmallIntegerComparison: JumpNonZero]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveSmallFloatAdd (in category 'primitive generators') ----- genPrimitiveSmallFloatAdd <option: #Spur64BitMemoryManager> + ^coInterpreter getPrimitiveDoMixedArithmetic - ^self getPrimitiveDoMixedArithmetic ifTrue: [self genSmallFloatArithmetic: AddRdRd preOpCheck: nil] ifFalse: [self genPureSmallFloatArithmetic: AddRdRd preOpCheck: nil]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveSmallFloatDivide (in category 'primitive generators') ----- genPrimitiveSmallFloatDivide <option: #Spur64BitMemoryManager> + ^coInterpreter getPrimitiveDoMixedArithmetic - ^self getPrimitiveDoMixedArithmetic ifTrue: [self genSmallFloatArithmetic: DivRdRd preOpCheck: #genDoubleFailIfZeroArgRcvr:arg:] ifFalse: [self genPureSmallFloatArithmetic: DivRdRd preOpCheck: #genDoubleFailIfZeroArgRcvr:arg:]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveSmallFloatEqual (in category 'primitive generators') ----- genPrimitiveSmallFloatEqual <option: #Spur64BitMemoryManager> + ^coInterpreter getPrimitiveDoMixedArithmetic + ifTrue: [self genSmallFloatComparison: #JumpFPEqual: orIntegerComparison: JumpZero] + ifFalse: [self genPureSmallFloatComparison: #JumpFPEqual:]! - ^self getPrimitiveDoMixedArithmetic - ifTrue: [self genSmallFloatComparison: #JumpFPEqual: orIntegerComparison: JumpZero invert: false] - ifFalse: [self genPureSmallFloatComparison: #JumpFPEqual: invert: false]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveSmallFloatGreaterOrEqual (in category 'primitive generators') ----- genPrimitiveSmallFloatGreaterOrEqual <option: #Spur64BitMemoryManager> + ^coInterpreter getPrimitiveDoMixedArithmetic + ifTrue: [self genSmallFloatComparison: #JumpFPGreaterOrEqual: orIntegerComparison: JumpGreaterOrEqual ] + ifFalse: [self genPureSmallFloatComparison: #JumpFPGreaterOrEqual: ]! - ^self getPrimitiveDoMixedArithmetic - ifTrue: [self genSmallFloatComparison: #JumpFPGreaterOrEqual: orIntegerComparison: JumpGreaterOrEqual invert: false] - ifFalse: [self genPureSmallFloatComparison: #JumpFPGreaterOrEqual: invert: false]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveSmallFloatGreaterThan (in category 'primitive generators') ----- genPrimitiveSmallFloatGreaterThan <option: #Spur64BitMemoryManager> + ^coInterpreter getPrimitiveDoMixedArithmetic + ifTrue: [self genSmallFloatComparison: #JumpFPGreater: orIntegerComparison: JumpGreater ] + ifFalse: [self genPureSmallFloatComparison: #JumpFPGreater: ]! - ^self getPrimitiveDoMixedArithmetic - ifTrue: [self genSmallFloatComparison: #JumpFPGreater: orIntegerComparison: JumpGreater invert: false] - ifFalse: [self genPureSmallFloatComparison: #JumpFPGreater: invert: false]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveSmallFloatLessOrEqual (in category 'primitive generators') ----- genPrimitiveSmallFloatLessOrEqual <option: #Spur64BitMemoryManager> + ^coInterpreter getPrimitiveDoMixedArithmetic + ifTrue: [self genSmallFloatComparison: #JumpFPLessOrEqual: orIntegerComparison: JumpLessOrEqual ] + ifFalse: [self genPureSmallFloatComparison: #JumpFPLessOrEqual: ]! - ^self getPrimitiveDoMixedArithmetic - ifTrue: [self genSmallFloatComparison: #JumpFPGreaterOrEqual: orIntegerComparison: JumpLessOrEqual invert: true] - ifFalse: [self genPureSmallFloatComparison: #JumpFPGreaterOrEqual: invert: true]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveSmallFloatLessThan (in category 'primitive generators') ----- genPrimitiveSmallFloatLessThan <option: #Spur64BitMemoryManager> + ^coInterpreter getPrimitiveDoMixedArithmetic + ifTrue: [self genSmallFloatComparison: #JumpFPLess: orIntegerComparison: JumpLess ] + ifFalse: [self genPureSmallFloatComparison: #JumpFPLess: ]! - ^self getPrimitiveDoMixedArithmetic - ifTrue: [self genSmallFloatComparison: #JumpFPGreater: orIntegerComparison: JumpLess invert: true] - ifFalse: [self genPureSmallFloatComparison: #JumpFPGreater: invert: true]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveSmallFloatMultiply (in category 'primitive generators') ----- genPrimitiveSmallFloatMultiply <option: #Spur64BitMemoryManager> + ^coInterpreter getPrimitiveDoMixedArithmetic - ^self getPrimitiveDoMixedArithmetic ifTrue: [self genSmallFloatArithmetic: MulRdRd preOpCheck: nil] ifFalse: [self genPureSmallFloatArithmetic: MulRdRd preOpCheck: nil]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveSmallFloatNotEqual (in category 'primitive generators') ----- genPrimitiveSmallFloatNotEqual <option: #Spur64BitMemoryManager> + ^coInterpreter getPrimitiveDoMixedArithmetic + ifTrue: [self genSmallFloatComparison: #JumpFPNotEqual: orIntegerComparison: JumpNonZero] + ifFalse: [self genPureSmallFloatComparison: #JumpFPNotEqual:]! - ^self getPrimitiveDoMixedArithmetic - ifTrue: [self genSmallFloatComparison: #JumpFPNotEqual: orIntegerComparison: JumpNonZero invert: false] - ifFalse: [self genPureSmallFloatComparison: #JumpFPNotEqual: invert: false]! Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveSmallFloatSubtract (in category 'primitive generators') ----- genPrimitiveSmallFloatSubtract <option: #Spur64BitMemoryManager> + ^coInterpreter getPrimitiveDoMixedArithmetic - ^self getPrimitiveDoMixedArithmetic ifTrue: [self genSmallFloatArithmetic: SubRdRd preOpCheck: nil] ifFalse: [self genPureSmallFloatArithmetic: SubRdRd preOpCheck: nil]! Item was added: + ----- Method: CogObjectRepresentation>>genPureDoubleComparison: (in category 'primitive generators') ----- + genPureDoubleComparison: jumpOpcodeGenerator + "In the Pure version, mixed arithmetic with SmallInteger is forbidden" + <option: #DPFPReg0> + <var: #jumpOpcodeGenerator declareC: 'AbstractInstruction * NoDbgRegParms (*jumpOpcodeGenerator)(void *)'> + | jumpFail jumpImmediate jumpCond compare | + <var: #jumpImmediate type: #'AbstractInstruction *'> + <var: #jumpCond type: #'AbstractInstruction *'> + <var: #compare type: #'AbstractInstruction *'> + <var: #jumpFail type: #'AbstractInstruction *'> + cogit processorHasDoublePrecisionFloatingPointSupport ifFalse: + [^UnimplementedPrimitive]. + cogit genLoadArgAtDepth: 0 into: Arg0Reg. + self genGetDoubleValueOf: ReceiverResultReg into: DPFPReg0. + jumpImmediate := self genJumpImmediate: Arg0Reg. + self genGetCompactClassIndexNonImmOf: Arg0Reg into: SendNumArgsReg. + self genCmpClassFloatCompactIndexR: SendNumArgsReg. + jumpFail := cogit JumpNonZero: 0. + self genGetDoubleValueOf: Arg0Reg into: DPFPReg1. + compare := cogit CmpRd: DPFPReg1 Rd: DPFPReg0. + jumpCond := cogit perform: jumpOpcodeGenerator with: 0. "FP jumps are a little weird" + cogit genMoveFalseR: ReceiverResultReg. + cogit genPrimReturn. + jumpCond jmpTarget: (cogit genMoveTrueR: ReceiverResultReg). + cogit genPrimReturn. + jumpImmediate jmpTarget: cogit Label. + self maybeGenConvertIfSmallFloatIn: Arg0Reg scratchReg: TempReg into: DPFPReg1 andJumpTo: compare. + jumpFail jmpTarget: cogit Label. + ^CompletePrimitive! Item was removed: - ----- Method: CogObjectRepresentation>>genPureDoubleComparison:invert: (in category 'primitive generators') ----- - genPureDoubleComparison: jumpOpcodeGenerator invert: invertComparison - "In the Pure version, mixed arithmetic with SmallInteger is forbidden" - <option: #DPFPReg0> - <var: #jumpOpcodeGenerator declareC: 'AbstractInstruction * NoDbgRegParms (*jumpOpcodeGenerator)(void *)'> - | jumpFail jumpImmediate jumpCond compare | - <var: #jumpImmediate type: #'AbstractInstruction *'> - <var: #jumpCond type: #'AbstractInstruction *'> - <var: #compare type: #'AbstractInstruction *'> - <var: #jumpFail type: #'AbstractInstruction *'> - cogit processorHasDoublePrecisionFloatingPointSupport ifFalse: - [^UnimplementedPrimitive]. - cogit genLoadArgAtDepth: 0 into: Arg0Reg. - self genGetDoubleValueOf: ReceiverResultReg into: DPFPReg0. - jumpImmediate := self genJumpImmediate: Arg0Reg. - self genGetCompactClassIndexNonImmOf: Arg0Reg into: SendNumArgsReg. - self genCmpClassFloatCompactIndexR: SendNumArgsReg. - jumpFail := cogit JumpNonZero: 0. - self genGetDoubleValueOf: Arg0Reg into: DPFPReg1. - invertComparison "May need to invert for NaNs" - ifTrue: [compare := cogit CmpRd: DPFPReg0 Rd: DPFPReg1] - ifFalse: [compare := cogit CmpRd: DPFPReg1 Rd: DPFPReg0]. - jumpCond := cogit perform: jumpOpcodeGenerator with: 0. "FP jumps are a little weird" - cogit genMoveFalseR: ReceiverResultReg. - cogit genPrimReturn. - jumpCond jmpTarget: (cogit genMoveTrueR: ReceiverResultReg). - cogit genPrimReturn. - jumpImmediate jmpTarget: cogit Label. - self maybeGenConvertIfSmallFloatIn: Arg0Reg scratchReg: TempReg into: DPFPReg1 andJumpTo: compare. - jumpFail jmpTarget: cogit Label. - ^CompletePrimitive! Item was added: + ----- Method: CogObjectRepresentation>>genSmallIntegerComparison:orDoubleComparison: (in category 'primitive generators') ----- + genSmallIntegerComparison: jumpOpcode orDoubleComparison: jumpFPOpcodeGenerator + "Stack looks like + return address" + | jumpNonInt jumpFail jumpCond r | + <var: #jumpFPOpcodeGenerator declareC: 'AbstractInstruction * NoDbgRegParms (*jumpFPOpcodeGenerator)(void *)'> + <var: #jumpNonInt type: #'AbstractInstruction *'> + <var: #jumpCond type: #'AbstractInstruction *'> + <var: #jumpFail type: #'AbstractInstruction *'> + r := self genSmallIntegerComparison: jumpOpcode. + r < 0 ifTrue: + [^r]. + self cppIf: #DPFPReg0 defined ifTrue: + "Fall through on non-SmallInteger argument. Argument may be a Float : let us check or fail" + [self smallIntegerIsOnlyImmediateType ifFalse: + [jumpNonInt := self genJumpImmediate: Arg0Reg]. + self genGetCompactClassIndexNonImmOf: Arg0Reg into: SendNumArgsReg. + self genCmpClassFloatCompactIndexR: SendNumArgsReg. + jumpFail := cogit JumpNonZero: 0. + + "It was a Float, so convert the receiver to double and perform the operation" + self genConvertSmallIntegerToIntegerInReg: ReceiverResultReg. + cogit ConvertR: ReceiverResultReg Rd: DPFPReg0. + self genGetDoubleValueOf: Arg0Reg into: DPFPReg1. + cogit CmpRd: DPFPReg1 Rd: DPFPReg0. + jumpCond := cogit perform: jumpFPOpcodeGenerator with: 0. "FP jumps are a little weird" + cogit genMoveFalseR: ReceiverResultReg. + cogit genPrimReturn. + jumpCond jmpTarget: (cogit genMoveTrueR: ReceiverResultReg). + cogit genPrimReturn. + + self smallIntegerIsOnlyImmediateType + ifTrue: [jumpFail jmpTarget: cogit Label] + ifFalse: [jumpNonInt jmpTarget: (jumpFail jmpTarget: cogit Label)]]. + ^CompletePrimitive! Item was removed: - ----- Method: CogObjectRepresentation>>genSmallIntegerComparison:orDoubleComparison:invert: (in category 'primitive generators') ----- - genSmallIntegerComparison: jumpOpcode orDoubleComparison: jumpFPOpcodeGenerator invert: invertComparison - "Stack looks like - return address" - | jumpNonInt jumpFail jumpCond r | - <var: #jumpFPOpcodeGenerator declareC: 'AbstractInstruction * NoDbgRegParms (*jumpFPOpcodeGenerator)(void *)'> - <var: #jumpNonInt type: #'AbstractInstruction *'> - <var: #jumpCond type: #'AbstractInstruction *'> - <var: #jumpFail type: #'AbstractInstruction *'> - r := self genSmallIntegerComparison: jumpOpcode. - r < 0 ifTrue: - [^r]. - self cppIf: #DPFPReg0 defined ifTrue: - "Fall through on non-SmallInteger argument. Argument may be a Float : let us check or fail" - [self smallIntegerIsOnlyImmediateType ifFalse: - [jumpNonInt := self genJumpImmediate: Arg0Reg]. - self genGetCompactClassIndexNonImmOf: Arg0Reg into: SendNumArgsReg. - self genCmpClassFloatCompactIndexR: SendNumArgsReg. - jumpFail := cogit JumpNonZero: 0. - - "It was a Float, so convert the receiver to double and perform the operation" - self genConvertSmallIntegerToIntegerInReg: ReceiverResultReg. - cogit ConvertR: ReceiverResultReg Rd: DPFPReg0. - self genGetDoubleValueOf: Arg0Reg into: DPFPReg1. - invertComparison "May need to invert for NaNs" - ifTrue: [cogit CmpRd: DPFPReg0 Rd: DPFPReg1] - ifFalse: [cogit CmpRd: DPFPReg1 Rd: DPFPReg0]. - jumpCond := cogit perform: jumpFPOpcodeGenerator with: 0. "FP jumps are a little weird" - cogit genMoveFalseR: ReceiverResultReg. - cogit genPrimReturn. - jumpCond jmpTarget: (cogit genMoveTrueR: ReceiverResultReg). - cogit genPrimReturn. - - self smallIntegerIsOnlyImmediateType - ifTrue: [jumpFail jmpTarget: cogit Label] - ifFalse: [jumpNonInt jmpTarget: (jumpFail jmpTarget: cogit Label)]]. - ^CompletePrimitive! Item was added: + ----- Method: CogObjectRepresentationFor64BitSpur>>genDoubleComparison:orIntegerComparison: (in category 'primitive generators') ----- + genDoubleComparison: jumpOpcodeGenerator orIntegerComparison: jumpOpcode + <inline: true> + ^self genFloatComparison: jumpOpcodeGenerator orIntegerComparison: jumpOpcode boxed: true! Item was removed: - ----- Method: CogObjectRepresentationFor64BitSpur>>genDoubleComparison:orIntegerComparison:invert: (in category 'primitive generators') ----- - genDoubleComparison: jumpOpcodeGenerator orIntegerComparison: jumpOpcode invert: invertComparison - <inline: true> - ^self genFloatComparison: jumpOpcodeGenerator orIntegerComparison: jumpOpcode invert: invertComparison boxed: true! Item was added: + ----- Method: CogObjectRepresentationFor64BitSpur>>genFloatComparison:orIntegerComparison:boxed: (in category 'primitive generators') ----- + genFloatComparison: jumpFPOpcodeGenerator orIntegerComparison: jumpOpcode boxed: rcvrBoxed + <var: #jumpFPOpcodeGenerator declareC: 'AbstractInstruction *(*jumpFPOpcodeGenerator)(void *)'> + <inline: false> + | jumpImmediate jumpNotSmallFloat jumpNotSmallInteger jumpNotBoxedFloat jumpCond compareFloat jumpNotAmbiguous jumpTrue returnTrue | + <var: #jumpNotSmallInteger type: #'AbstractInstruction *'> + <var: #jumpNotBoxedFloat type: #'AbstractInstruction *'> + <var: #jumpNotSmallFloat type: #'AbstractInstruction *'> + <var: #jumpImmediate type: #'AbstractInstruction *'> + <var: #jumpNotAmbiguous type: #'AbstractInstruction *'> + <var: #jumpCond type: #'AbstractInstruction *'> + <var: #jumpTrue type: #'AbstractInstruction *'> + <var: #returnTrue type: #'AbstractInstruction *'> + <var: #compareFloat type: #'AbstractInstruction *'> + cogit genLoadArgAtDepth: 0 into: Arg0Reg. + rcvrBoxed + ifTrue: [self genGetDoubleValueOf: ReceiverResultReg into: DPFPReg0] + ifFalse: [self genGetSmallFloatValueOf: ReceiverResultReg scratch: TempReg into: DPFPReg0]. + jumpNotSmallFloat := self genJumpNotSmallFloat: Arg0Reg. + self genGetSmallFloatValueOf: Arg0Reg scratch: TempReg into: DPFPReg1. + compareFloat := cogit CmpRd: DPFPReg1 Rd: DPFPReg0. + jumpCond := cogit perform: jumpFPOpcodeGenerator with: 0. "FP jumps are a little weird" + cogit genMoveFalseR: ReceiverResultReg. + cogit genPrimReturn. + jumpCond jmpTarget: (returnTrue := cogit genMoveTrueR: ReceiverResultReg). + cogit genPrimReturn. + + jumpNotSmallFloat jmpTarget: cogit Label. + jumpNotSmallInteger := self genJumpNotSmallInteger: Arg0Reg. + "Test for ambiguity, that is when floatRcvr == (double) intArg" + self genConvertSmallIntegerToIntegerInReg: Arg0Reg. + cogit ConvertR: Arg0Reg Rd: DPFPReg1. + cogit CmpRd: DPFPReg1 Rd: DPFPReg0. + "If floatRcvr !!= (double) intArg then use compareFloat(floatRcvr,(double) intArg)" + "else use compareInt(intArg,(int64) floatRcvr)" + jumpNotAmbiguous := cogit perform: #JumpFPNotEqual: with: 0. + "Case of non ambiguity, use compareFloat(floatRcvr,(double) intArg)" + jumpNotAmbiguous jmpTarget: compareFloat. + "Case of ambiguity, use compareInt((int64) floatRcvr, intArg)" + cogit ConvertRd: DPFPReg0 R: ReceiverResultReg. + cogit CmpR: Arg0Reg R: ReceiverResultReg. "N.B. FLAGS := RRReg - Arg0Reg" + jumpTrue := cogit genConditionalBranch: jumpOpcode operand: 0. + cogit genMoveFalseR: ReceiverResultReg. + cogit genPrimReturn. + jumpTrue jmpTarget: returnTrue. + + "not a Small Float, nor Small Integer, check for Boxed Float argument" + jumpNotSmallInteger jmpTarget: cogit Label. + jumpImmediate := self genJumpImmediate: Arg0Reg. + self genGetCompactClassIndexNonImmOf: Arg0Reg into: SendNumArgsReg. + self genCmpClassFloatCompactIndexR: SendNumArgsReg. + jumpNotBoxedFloat := cogit JumpNonZero: 0. + self genGetDoubleValueOf: Arg0Reg into: DPFPReg1. + cogit Jump: compareFloat. + + jumpImmediate jmpTarget: + (jumpNotBoxedFloat jmpTarget: cogit Label). + ^CompletePrimitive! Item was removed: - ----- Method: CogObjectRepresentationFor64BitSpur>>genFloatComparison:orIntegerComparison:invert:boxed: (in category 'primitive generators') ----- - genFloatComparison: jumpFPOpcodeGenerator orIntegerComparison: jumpOpcode invert: invertComparison boxed: rcvrBoxed - <var: #jumpFPOpcodeGenerator declareC: 'AbstractInstruction *(*jumpFPOpcodeGenerator)(void *)'> - <inline: false> - | jumpImmediate jumpNotSmallFloat jumpNotSmallInteger jumpNotBoxedFloat jumpCond compareFloat jumpAmbiguous jumpTrue returnTrue | - <var: #jumpNotSmallInteger type: #'AbstractInstruction *'> - <var: #jumpNotBoxedFloat type: #'AbstractInstruction *'> - <var: #jumpNotSmallFloat type: #'AbstractInstruction *'> - <var: #jumpImmediate type: #'AbstractInstruction *'> - <var: #jumpAmbiguous type: #'AbstractInstruction *'> - <var: #jumpCond type: #'AbstractInstruction *'> - <var: #jumpTrue type: #'AbstractInstruction *'> - <var: #returnTrue type: #'AbstractInstruction *'> - <var: #compareFloat type: #'AbstractInstruction *'> - cogit genLoadArgAtDepth: 0 into: Arg0Reg. - rcvrBoxed - ifTrue: [self genGetDoubleValueOf: ReceiverResultReg into: DPFPReg0] - ifFalse: [self genGetSmallFloatValueOf: ReceiverResultReg scratch: TempReg into: DPFPReg0]. - jumpNotSmallFloat := self genJumpNotSmallFloat: Arg0Reg. - self genGetSmallFloatValueOf: Arg0Reg scratch: TempReg into: DPFPReg1. - compareFloat := invertComparison "May need to invert for NaNs" - ifTrue: [cogit CmpRd: DPFPReg0 Rd: DPFPReg1] - ifFalse: [cogit CmpRd: DPFPReg1 Rd: DPFPReg0]. - jumpCond := cogit perform: jumpFPOpcodeGenerator with: 0. "FP jumps are a little weird" - cogit genMoveFalseR: ReceiverResultReg. - cogit genPrimReturn. - jumpCond jmpTarget: (returnTrue := cogit genMoveTrueR: ReceiverResultReg). - cogit genPrimReturn. - - jumpNotSmallFloat jmpTarget: cogit Label. - jumpNotSmallInteger := self genJumpNotSmallInteger: Arg0Reg. - "Test for ambiguity, that is when floatRcvr == (double) intArg" - self genConvertSmallIntegerToIntegerInReg: Arg0Reg. - cogit ConvertR: Arg0Reg Rd: DPFPReg1. - cogit CmpRd: DPFPReg0 Rd: DPFPReg1. - "If floatRcvr == (double) intArg then use compareInt(intArg,(int64) floatRcvr)" - "else use compareFloat(floatRcvr,(double) intArg)" - jumpAmbiguous := cogit perform: #JumpFPEqual: with: 0. - "Case of non ambiguity, use compareFloat(floatRcvr,(double) intArg)" - cogit Jump: compareFloat. - "Case of ambiguity, use compareInt((int64) floatRcvr, intArg)" - jumpAmbiguous jmpTarget: (cogit ConvertRd: DPFPReg0 R: ReceiverResultReg). - cogit CmpR: Arg0Reg R: ReceiverResultReg. "N.B. FLAGS := RRReg - Arg0Reg" - jumpTrue := cogit genConditionalBranch: jumpOpcode operand: 0. - cogit genMoveFalseR: ReceiverResultReg. - cogit genPrimReturn. - jumpTrue jmpTarget: returnTrue. - - "not a Small Float, nor Small Integer, check for Boxed Float argument" - jumpNotSmallInteger jmpTarget: cogit Label. - jumpImmediate := self genJumpImmediate: Arg0Reg. - self genGetCompactClassIndexNonImmOf: Arg0Reg into: SendNumArgsReg. - self genCmpClassFloatCompactIndexR: SendNumArgsReg. - jumpNotBoxedFloat := cogit JumpNonZero: 0. - self genGetDoubleValueOf: Arg0Reg into: DPFPReg1. - cogit Jump: compareFloat. - - jumpImmediate jmpTarget: - (jumpNotBoxedFloat jmpTarget: cogit Label). - ^CompletePrimitive! Item was changed: ----- Method: CogObjectRepresentationFor64BitSpur>>genPrimitiveFloatEqual (in category 'primitive generators') ----- genPrimitiveFloatEqual <option: #DPFPReg0> + ^coInterpreter getPrimitiveDoMixedArithmetic + ifTrue: [self genDoubleComparison: #JumpFPEqual: orIntegerComparison: JumpZero] + ifFalse: [self genPureDoubleComparison: #JumpFPEqual:]! - ^self getPrimitiveDoMixedArithmetic - ifTrue: [self genDoubleComparison: #JumpFPEqual: orIntegerComparison: JumpZero invert: false] - ifFalse: [self genPureDoubleComparison: #JumpFPEqual: invert: false]! Item was changed: ----- Method: CogObjectRepresentationFor64BitSpur>>genPrimitiveFloatGreaterOrEqual (in category 'primitive generators') ----- genPrimitiveFloatGreaterOrEqual <option: #DPFPReg0> + ^coInterpreter getPrimitiveDoMixedArithmetic + ifTrue: [self genDoubleComparison: #JumpFPGreaterOrEqual: orIntegerComparison: JumpGreaterOrEqual] + ifFalse: [self genPureDoubleComparison: #JumpFPGreaterOrEqual:]! - ^self getPrimitiveDoMixedArithmetic - ifTrue: [self genDoubleComparison: #JumpFPGreaterOrEqual: orIntegerComparison: JumpGreaterOrEqual invert: false] - ifFalse: [self genPureDoubleComparison: #JumpFPGreaterOrEqual: invert: false]! Item was changed: ----- Method: CogObjectRepresentationFor64BitSpur>>genPrimitiveFloatGreaterThan (in category 'primitive generators') ----- genPrimitiveFloatGreaterThan <option: #DPFPReg0> + ^coInterpreter getPrimitiveDoMixedArithmetic + ifTrue: [self genDoubleComparison: #JumpFPGreater: orIntegerComparison: JumpGreater] + ifFalse: [self genPureDoubleComparison: #JumpFPGreater:]! - ^self getPrimitiveDoMixedArithmetic - ifTrue: [self genDoubleComparison: #JumpFPGreater: orIntegerComparison: JumpGreater invert: false] - ifFalse: [self genPureDoubleComparison: #JumpFPGreater: invert: false]! Item was changed: ----- Method: CogObjectRepresentationFor64BitSpur>>genPrimitiveFloatLessOrEqual (in category 'primitive generators') ----- genPrimitiveFloatLessOrEqual <option: #DPFPReg0> + ^coInterpreter getPrimitiveDoMixedArithmetic + ifTrue: [self genDoubleComparison: #JumpFPLessOrEqual: orIntegerComparison: JumpLessOrEqual] + ifFalse: [self genPureDoubleComparison: #JumpFPLessOrEqual:]! - ^self getPrimitiveDoMixedArithmetic - ifTrue: [self genDoubleComparison: #JumpFPGreaterOrEqual: orIntegerComparison: JumpLessOrEqual invert: true] - ifFalse: [self genPureDoubleComparison: #JumpFPGreaterOrEqual: invert: true]! Item was changed: ----- Method: CogObjectRepresentationFor64BitSpur>>genPrimitiveFloatLessThan (in category 'primitive generators') ----- genPrimitiveFloatLessThan <option: #DPFPReg0> + ^coInterpreter getPrimitiveDoMixedArithmetic + ifTrue: [self genDoubleComparison: #JumpFPLess: orIntegerComparison: JumpLess] + ifFalse: [self genPureDoubleComparison: #JumpFPLess:]! - ^self getPrimitiveDoMixedArithmetic - ifTrue: [self genDoubleComparison: #JumpFPGreater: orIntegerComparison: JumpLess invert: true] - ifFalse: [self genPureDoubleComparison: #JumpFPGreater: invert: true]! Item was changed: ----- Method: CogObjectRepresentationFor64BitSpur>>genPrimitiveFloatNotEqual (in category 'primitive generators') ----- genPrimitiveFloatNotEqual <option: #DPFPReg0> + ^coInterpreter getPrimitiveDoMixedArithmetic + ifTrue: [self genDoubleComparison: #JumpFPNotEqual: orIntegerComparison: JumpNonZero] + ifFalse: [self genPureDoubleComparison: #JumpFPNotEqual:]! - ^self getPrimitiveDoMixedArithmetic - ifTrue: [self genDoubleComparison: #JumpFPNotEqual: orIntegerComparison: JumpNonZero invert: false] - ifFalse: [self genPureDoubleComparison: #JumpFPNotEqual: invert: false]! Item was added: + ----- Method: CogObjectRepresentationFor64BitSpur>>genPureDoubleComparison: (in category 'primitive generators') ----- + genPureDoubleComparison: jumpOpcodeGenerator + "In the Pure version, mixed arithmetic with SmallInteger is forbidden" + <inline: true> + ^self genPureFloatComparison: jumpOpcodeGenerator boxed: true! Item was removed: - ----- Method: CogObjectRepresentationFor64BitSpur>>genPureDoubleComparison:invert: (in category 'primitive generators') ----- - genPureDoubleComparison: jumpOpcodeGenerator invert: invertComparison - "In the Pure version, mixed arithmetic with SmallInteger is forbidden" - <inline: true> - ^self genPureFloatComparison: jumpOpcodeGenerator invert: invertComparison boxed: true! Item was added: + ----- Method: CogObjectRepresentationFor64BitSpur>>genPureFloatComparison:boxed: (in category 'primitive generators') ----- + genPureFloatComparison: jumpFPOpcodeGenerator boxed: rcvrBoxed + "In the Pure version, mixed arithmetic with SmallInteger is forbidden" + <var: #jumpFPOpcodeGenerator declareC: 'AbstractInstruction *(*jumpFPOpcodeGenerator)(void *)'> + <inline: false> + | jumpImmediate jumpNotSmallFloat jumpNotBoxedFloat jumpCond compareFloat | + <var: #jumpNotBoxedFloat type: #'AbstractInstruction *'> + <var: #jumpNotSmallFloat type: #'AbstractInstruction *'> + <var: #jumpImmediate type: #'AbstractInstruction *'> + <var: #jumpCond type: #'AbstractInstruction *'> + <var: #compareFloat type: #'AbstractInstruction *'> + cogit genLoadArgAtDepth: 0 into: Arg0Reg. + rcvrBoxed + ifTrue: [self genGetDoubleValueOf: ReceiverResultReg into: DPFPReg0] + ifFalse: [self genGetSmallFloatValueOf: ReceiverResultReg scratch: TempReg into: DPFPReg0]. + jumpNotSmallFloat := self genJumpNotSmallFloat: Arg0Reg. + self genGetSmallFloatValueOf: Arg0Reg scratch: TempReg into: DPFPReg1. + compareFloat := cogit CmpRd: DPFPReg1 Rd: DPFPReg0. + jumpCond := cogit perform: jumpFPOpcodeGenerator with: 0. "FP jumps are a little weird" + cogit genMoveFalseR: ReceiverResultReg. + cogit genPrimReturn. + jumpCond jmpTarget: (cogit genMoveTrueR: ReceiverResultReg). + cogit genPrimReturn. + + "not a Small Float, check for Boxed Float argument" + jumpNotSmallFloat jmpTarget: cogit Label. + jumpImmediate := self genJumpImmediate: Arg0Reg. + self genGetCompactClassIndexNonImmOf: Arg0Reg into: SendNumArgsReg. + self genCmpClassFloatCompactIndexR: SendNumArgsReg. + jumpNotBoxedFloat := cogit JumpNonZero: 0. + self genGetDoubleValueOf: Arg0Reg into: DPFPReg1. + cogit Jump: compareFloat. + + jumpImmediate jmpTarget: + (jumpNotBoxedFloat jmpTarget: cogit Label). + ^CompletePrimitive! Item was removed: - ----- Method: CogObjectRepresentationFor64BitSpur>>genPureFloatComparison:invert:boxed: (in category 'primitive generators') ----- - genPureFloatComparison: jumpFPOpcodeGenerator invert: invertComparison boxed: rcvrBoxed - "In the Pure version, mixed arithmetic with SmallInteger is forbidden" - <var: #jumpFPOpcodeGenerator declareC: 'AbstractInstruction *(*jumpFPOpcodeGenerator)(void *)'> - <inline: false> - | jumpImmediate jumpNotSmallFloat jumpNotBoxedFloat jumpCond compareFloat | - <var: #jumpNotBoxedFloat type: #'AbstractInstruction *'> - <var: #jumpNotSmallFloat type: #'AbstractInstruction *'> - <var: #jumpImmediate type: #'AbstractInstruction *'> - <var: #jumpCond type: #'AbstractInstruction *'> - <var: #compareFloat type: #'AbstractInstruction *'> - cogit genLoadArgAtDepth: 0 into: Arg0Reg. - rcvrBoxed - ifTrue: [self genGetDoubleValueOf: ReceiverResultReg into: DPFPReg0] - ifFalse: [self genGetSmallFloatValueOf: ReceiverResultReg scratch: TempReg into: DPFPReg0]. - jumpNotSmallFloat := self genJumpNotSmallFloat: Arg0Reg. - self genGetSmallFloatValueOf: Arg0Reg scratch: TempReg into: DPFPReg1. - compareFloat := invertComparison "May need to invert for NaNs" - ifTrue: [cogit CmpRd: DPFPReg0 Rd: DPFPReg1] - ifFalse: [cogit CmpRd: DPFPReg1 Rd: DPFPReg0]. - jumpCond := cogit perform: jumpFPOpcodeGenerator with: 0. "FP jumps are a little weird" - cogit genMoveFalseR: ReceiverResultReg. - cogit genPrimReturn. - jumpCond jmpTarget: (cogit genMoveTrueR: ReceiverResultReg). - cogit genPrimReturn. - - "not a Small Float, check for Boxed Float argument" - jumpNotSmallFloat jmpTarget: cogit Label. - jumpImmediate := self genJumpImmediate: Arg0Reg. - self genGetCompactClassIndexNonImmOf: Arg0Reg into: SendNumArgsReg. - self genCmpClassFloatCompactIndexR: SendNumArgsReg. - jumpNotBoxedFloat := cogit JumpNonZero: 0. - self genGetDoubleValueOf: Arg0Reg into: DPFPReg1. - cogit Jump: compareFloat. - - jumpImmediate jmpTarget: - (jumpNotBoxedFloat jmpTarget: cogit Label). - ^CompletePrimitive! Item was added: + ----- Method: CogObjectRepresentationFor64BitSpur>>genPureSmallFloatComparison: (in category 'primitive generators') ----- + genPureSmallFloatComparison: jumpOpcodeGenerator + "In the Pure version, mixed arithmetic with SmallInteger is forbidden" + <inline: true> + ^self genPureFloatComparison: jumpOpcodeGenerator boxed: false! Item was removed: - ----- Method: CogObjectRepresentationFor64BitSpur>>genPureSmallFloatComparison:invert: (in category 'primitive generators') ----- - genPureSmallFloatComparison: jumpOpcodeGenerator invert: invertComparison - "In the Pure version, mixed arithmetic with SmallInteger is forbidden" - <inline: true> - ^self genPureFloatComparison: jumpOpcodeGenerator invert: invertComparison boxed: false! Item was added: + ----- Method: CogObjectRepresentationFor64BitSpur>>genSmallFloatComparison:orIntegerComparison: (in category 'primitive generators') ----- + genSmallFloatComparison: jumpOpcodeGenerator orIntegerComparison: jumpOpcode + <inline: true> + ^self genFloatComparison: jumpOpcodeGenerator orIntegerComparison: jumpOpcode boxed: false! Item was removed: - ----- Method: CogObjectRepresentationFor64BitSpur>>genSmallFloatComparison:orIntegerComparison:invert: (in category 'primitive generators') ----- - genSmallFloatComparison: jumpOpcodeGenerator orIntegerComparison: jumpOpcode invert: invertComparison - <inline: true> - ^self genFloatComparison: jumpOpcodeGenerator orIntegerComparison: jumpOpcode invert: invertComparison boxed: false! Item was added: + ----- Method: CogObjectRepresentationFor64BitSpur>>genSmallIntegerComparison:orDoubleComparison: (in category 'primitive generators') ----- + genSmallIntegerComparison: jumpOpcode orDoubleComparison: jumpFPOpcodeGenerator + "Stack looks like + return address" + | jumpCond r compareIntFloat jumpAmbiguous jumpNotBoxedFloat jumpNotFloatAtAll jumpNotSmallFloat jumpTrue returnTrue | + <var: #jumpFPOpcodeGenerator declareC: 'AbstractInstruction * NoDbgRegParms (*jumpFPOpcodeGenerator)(void *)'> + <var: #jumpNonInt type: #'AbstractInstruction *'> + <var: #jumpCond type: #'AbstractInstruction *'> + <var: #jumpTrue type: #'AbstractInstruction *'> + <var: #returnTrue type: #'AbstractInstruction *'> + <var: #jumpAmbiguous type: #'AbstractInstruction *'> + <var: #jumpNotBoxedFloat type: #'AbstractInstruction *'> + <var: #jumpNotSmallFloat type: #'AbstractInstruction *'> + <var: #jumpNotFloatAtAll type: #'AbstractInstruction *'> + <var: #compareIntFloat type: #'AbstractInstruction *'> + r := self genSmallIntegerComparison: jumpOpcode. + r < 0 ifTrue: + [^r]. + self cppIf: #DPFPReg0 defined ifTrue: + "Fall through on non-SmallInteger argument. Argument may be a Float : let us check or fail" + [ + "check for Small Float argument" + jumpNotSmallFloat := self genJumpNotSmallFloat: Arg0Reg. + self genGetSmallFloatValueOf: Arg0Reg scratch: TempReg into: DPFPReg1. + + "Case of (int compare: float). Test for ambiguity, that is when (double) intRcvr == floatArg" + compareIntFloat := cogit Label. + self genConvertSmallIntegerToIntegerInReg: ReceiverResultReg. + cogit ConvertR: ReceiverResultReg Rd: DPFPReg0. + cogit CmpRd: DPFPReg0 Rd: DPFPReg1. + jumpAmbiguous := cogit perform: #JumpFPEqual: with: 0. + "Case of non ambiguity, use compareFloat((double) intRcvr,floatArg)" + cogit CmpRd: DPFPReg1 Rd: DPFPReg0. + jumpCond := cogit perform: jumpFPOpcodeGenerator with: 0. "FP jumps are a little weird" + cogit genMoveFalseR: ReceiverResultReg. + cogit genPrimReturn. + jumpCond jmpTarget: (returnTrue := cogit genMoveTrueR: ReceiverResultReg). + cogit genPrimReturn. + "Case of ambiguity, use compareInt(intRcvr , (int64) floatArg)" + jumpAmbiguous jmpTarget: (cogit ConvertRd: DPFPReg1 R: Arg0Reg). + cogit CmpR: Arg0Reg R: ReceiverResultReg. "N.B. FLAGS := RRReg - Arg0Reg" + jumpTrue := cogit genConditionalBranch: jumpOpcode operand: 0. + cogit genMoveFalseR: ReceiverResultReg. + cogit genPrimReturn. + jumpTrue jmpTarget: returnTrue. + + "not a Small Float, check for Boxed Float argument" + jumpNotSmallFloat jmpTarget: (jumpNotFloatAtAll := self genJumpImmediate: Arg0Reg). + self genGetCompactClassIndexNonImmOf: Arg0Reg into: SendNumArgsReg. + self genCmpClassFloatCompactIndexR: SendNumArgsReg. + jumpNotBoxedFloat := cogit JumpNonZero: 0. + "It was a Boxed Float, so convert the receiver to double and perform the (int compare: float) operation" + self genGetDoubleValueOf: Arg0Reg into: DPFPReg1. + cogit Jump: compareIntFloat. + + "not a Float, just let the primitive fall thru failure" + jumpNotBoxedFloat jmpTarget: (jumpNotFloatAtAll jmpTarget: cogit Label)]. + ^CompletePrimitive! Item was removed: - ----- Method: CogObjectRepresentationFor64BitSpur>>genSmallIntegerComparison:orDoubleComparison:invert: (in category 'primitive generators') ----- - genSmallIntegerComparison: jumpOpcode orDoubleComparison: jumpFPOpcodeGenerator invert: invertComparison - "Stack looks like - return address" - | jumpCond r compareIntFloat jumpAmbiguous jumpNotBoxedFloat jumpNotFloatAtAll jumpNotSmallFloat jumpTrue returnTrue | - <var: #jumpFPOpcodeGenerator declareC: 'AbstractInstruction * NoDbgRegParms (*jumpFPOpcodeGenerator)(void *)'> - <var: #jumpNonInt type: #'AbstractInstruction *'> - <var: #jumpCond type: #'AbstractInstruction *'> - <var: #jumpTrue type: #'AbstractInstruction *'> - <var: #returnTrue type: #'AbstractInstruction *'> - <var: #jumpAmbiguous type: #'AbstractInstruction *'> - <var: #jumpNotBoxedFloat type: #'AbstractInstruction *'> - <var: #jumpNotSmallFloat type: #'AbstractInstruction *'> - <var: #jumpNotFloatAtAll type: #'AbstractInstruction *'> - <var: #compareIntFloat type: #'AbstractInstruction *'> - r := self genSmallIntegerComparison: jumpOpcode. - r < 0 ifTrue: - [^r]. - self cppIf: #DPFPReg0 defined ifTrue: - "Fall through on non-SmallInteger argument. Argument may be a Float : let us check or fail" - [ - "check for Small Float argument" - jumpNotSmallFloat := self genJumpNotSmallFloat: Arg0Reg. - self genGetSmallFloatValueOf: Arg0Reg scratch: TempReg into: DPFPReg1. - - "Case of (int compare: float). Test for ambiguity, that is when (double) intRcvr == floatArg" - compareIntFloat := cogit Label. - self genConvertSmallIntegerToIntegerInReg: ReceiverResultReg. - cogit ConvertR: ReceiverResultReg Rd: DPFPReg0. - cogit CmpRd: DPFPReg0 Rd: DPFPReg1. - jumpAmbiguous := cogit perform: #JumpFPEqual: with: 0. - "Case of non ambiguity, use compareFloat((double) intRcvr,floatArg)" - invertComparison "May need to invert for NaNs" - ifTrue: [cogit CmpRd: DPFPReg0 Rd: DPFPReg1] - ifFalse: [cogit CmpRd: DPFPReg1 Rd: DPFPReg0]. - jumpCond := cogit perform: jumpFPOpcodeGenerator with: 0. "FP jumps are a little weird" - cogit genMoveFalseR: ReceiverResultReg. - cogit genPrimReturn. - jumpCond jmpTarget: (returnTrue := cogit genMoveTrueR: ReceiverResultReg). - cogit genPrimReturn. - "Case of ambiguity, use compareInt(intRcvr , (int64) floatArg)" - jumpAmbiguous jmpTarget: (cogit ConvertRd: DPFPReg1 R: Arg0Reg). - cogit CmpR: Arg0Reg R: ReceiverResultReg. "N.B. FLAGS := RRReg - Arg0Reg" - jumpTrue := cogit genConditionalBranch: jumpOpcode operand: 0. - cogit genMoveFalseR: ReceiverResultReg. - cogit genPrimReturn. - jumpTrue jmpTarget: returnTrue. - - "not a Small Float, check for Boxed Float argument" - jumpNotSmallFloat jmpTarget: (jumpNotFloatAtAll := self genJumpImmediate: Arg0Reg). - self genGetCompactClassIndexNonImmOf: Arg0Reg into: SendNumArgsReg. - self genCmpClassFloatCompactIndexR: SendNumArgsReg. - jumpNotBoxedFloat := cogit JumpNonZero: 0. - "It was a Boxed Float, so convert the receiver to double and perform the (int compare: float) operation" - self genGetDoubleValueOf: Arg0Reg into: DPFPReg1. - cogit Jump: compareIntFloat. - - "not a Float, just let the primitive fall thru failure" - jumpNotBoxedFloat jmpTarget: (jumpNotFloatAtAll jmpTarget: cogit Label)]. - ^CompletePrimitive! Item was changed: ----- Method: CogX64Compiler>>generateCheckLZCNT (in category 'feature detection') ----- generateCheckLZCNT "to check is Leading Zero Count operation is present cf. MSVC builtin __lzcnt documentation The result will be in bit 5 of return value (in RAX)" cogit PushR: RDX; PushR: RCX; PushR: RBX; + MoveCq: 16r80000001 R: RAX; - MoveCw: 16r80000001 R: RAX; gen: CPUID; MoveR: RCX R: RAX; PopR: RBX; PopR: RCX; PopR: RDX; RetN: 0! Item was changed: ----- Method: InterpreterPrimitives>>primitiveSmallFloatEqual (in category 'arithmetic float primitives') ----- primitiveSmallFloatEqual <option: #Spur64BitMemoryManager> | rcvr arg intArg | <var: #rcvr type: #double> <var: #arg type: #double> rcvr := objectMemory smallFloatValueOf: (self stackValue: 1). arg := objectMemory loadFloatOrIntFrom: self stackTop. self successful ifTrue: [self cppIf: objectMemory wordSize > 4 + ifTrue: [((objectMemory isIntegerObject: self stackTop) and: [rcvr = arg]) - ifTrue: [((self isIntegerObject: self stackTop) and: [rcvr = arg]) ifTrue: ["Resolve case of ambiguity so as to have comparison of exact values" + intArg := objectMemory integerValueOf: self stackTop. - intArg := self integerValueOf: self stackTop. self pop: 2 thenPushBool: rcvr asInteger = intArg] ifFalse: [self pop: 2 thenPushBool: rcvr = arg]] ifFalse: [self pop: 2 thenPushBool: rcvr = arg]]! Item was changed: ----- Method: InterpreterPrimitives>>primitiveSmallFloatGreaterOrEqual (in category 'arithmetic float primitives') ----- primitiveSmallFloatGreaterOrEqual <option: #Spur64BitMemoryManager> | rcvr arg intArg | <var: #rcvr type: #double> <var: #arg type: #double> rcvr := objectMemory smallFloatValueOf: (self stackValue: 1). arg := objectMemory loadFloatOrIntFrom: self stackTop. self successful ifTrue: [self cppIf: objectMemory wordSize > 4 + ifTrue: [((objectMemory isIntegerObject: self stackTop) and: [rcvr = arg]) - ifTrue: [((self isIntegerObject: self stackTop) and: [rcvr = arg]) ifTrue: ["Resolve case of ambiguity so as to have comparison of exact values" + intArg := objectMemory integerValueOf: self stackTop. - intArg := self integerValueOf: self stackTop. self pop: 2 thenPushBool: rcvr asInteger >= intArg] ifFalse: [self pop: 2 thenPushBool: rcvr >= arg]] ifFalse: [self pop: 2 thenPushBool: rcvr >= arg]]! Item was changed: ----- Method: InterpreterPrimitives>>primitiveSmallFloatGreaterThan (in category 'arithmetic float primitives') ----- primitiveSmallFloatGreaterThan <option: #Spur64BitMemoryManager> | rcvr arg intArg | <var: #rcvr type: #double> <var: #arg type: #double> rcvr := objectMemory smallFloatValueOf: (self stackValue: 1). arg := objectMemory loadFloatOrIntFrom: self stackTop. self successful ifTrue: [self cppIf: objectMemory wordSize > 4 + ifTrue: [((objectMemory isIntegerObject: self stackTop) and: [rcvr = arg]) - ifTrue: [((self isIntegerObject: self stackTop) and: [rcvr = arg]) ifTrue: ["Resolve case of ambiguity so as to have comparison of exact values" + intArg := objectMemory integerValueOf: self stackTop. - intArg := self integerValueOf: self stackTop. self pop: 2 thenPushBool: rcvr asInteger > intArg] ifFalse: [self pop: 2 thenPushBool: rcvr > arg]] ifFalse: [self pop: 2 thenPushBool: rcvr > arg]]! Item was changed: ----- Method: InterpreterPrimitives>>primitiveSmallFloatLessOrEqual (in category 'arithmetic float primitives') ----- primitiveSmallFloatLessOrEqual <option: #Spur64BitMemoryManager> | rcvr arg intArg | <var: #rcvr type: #double> <var: #arg type: #double> rcvr := objectMemory smallFloatValueOf: (self stackValue: 1). arg := objectMemory loadFloatOrIntFrom: self stackTop. self successful ifTrue: [self cppIf: objectMemory wordSize > 4 + ifTrue: [((objectMemory isIntegerObject: self stackTop) and: [rcvr = arg]) - ifTrue: [((self isIntegerObject: self stackTop) and: [rcvr = arg]) ifTrue: ["Resolve case of ambiguity so as to have comparison of exact values" + intArg := objectMemory integerValueOf: self stackTop. - intArg := self integerValueOf: self stackTop. self pop: 2 thenPushBool: rcvr asInteger <= intArg] ifFalse: [self pop: 2 thenPushBool: rcvr <= arg]] ifFalse: [self pop: 2 thenPushBool: rcvr <= arg]]! Item was changed: ----- Method: InterpreterPrimitives>>primitiveSmallFloatLessThan (in category 'arithmetic float primitives') ----- primitiveSmallFloatLessThan <option: #Spur64BitMemoryManager> | rcvr arg intArg | <var: #rcvr type: #double> <var: #arg type: #double> rcvr := objectMemory smallFloatValueOf: (self stackValue: 1). arg := objectMemory loadFloatOrIntFrom: self stackTop. self successful ifTrue: [self cppIf: objectMemory wordSize > 4 + ifTrue: [((objectMemory isIntegerObject: self stackTop) and: [rcvr = arg]) - ifTrue: [((self isIntegerObject: self stackTop) and: [rcvr = arg]) ifTrue: ["Resolve case of ambiguity so as to have comparison of exact values" + intArg := objectMemory integerValueOf: self stackTop. - intArg := self integerValueOf: self stackTop. self pop: 2 thenPushBool: rcvr asInteger < intArg] ifFalse: [self pop: 2 thenPushBool: rcvr < arg]] ifFalse: [self pop: 2 thenPushBool: rcvr < arg]]! Item was changed: ----- Method: InterpreterPrimitives>>primitiveSmallFloatNotEqual (in category 'arithmetic float primitives') ----- primitiveSmallFloatNotEqual <option: #Spur64BitMemoryManager> | rcvr arg intArg | <var: #rcvr type: #double> <var: #arg type: #double> rcvr := objectMemory smallFloatValueOf: (self stackValue: 1). arg := objectMemory loadFloatOrIntFrom: self stackTop. self successful ifTrue: [self cppIf: objectMemory wordSize > 4 + ifTrue: [((objectMemory isIntegerObject: self stackTop) and: [rcvr = arg]) - ifTrue: [((self isIntegerObject: self stackTop) and: [rcvr = arg]) ifTrue: ["Resolve case of ambiguity so as to have comparison of exact values" + intArg := objectMemory integerValueOf: self stackTop. - intArg := self integerValueOf: self stackTop. self pop: 2 thenPushBool: (rcvr asInteger = intArg) not] ifFalse: [self pop: 2 thenPushBool: (rcvr = arg) not]] ifFalse: [self pop: 2 thenPushBool: (rcvr = arg) not]]! Item was changed: ----- Method: Spur64BitMemoryManager>>loadFloatOrIntFrom: (in category 'interpreter access') ----- loadFloatOrIntFrom: floatOrIntOop "If floatOrInt is an integer and we enable mixed arithmetic in primitives, then convert it to a C double float and return it. If it is a Float, then load its value and return it. Otherwise fail -- ie return with primErrorCode non-zero." <inline: true> <returnTypeC: #double> | result tagBits | <var: #result type: #double> (tagBits := floatOrIntOop bitAnd: self tagMask) ~= 0 ifTrue: [tagBits = self smallFloatTag ifTrue: [^self smallFloatValueOf: floatOrIntOop]. + (coInterpreter primitiveDoMixedArithmetic and: [tagBits = self smallIntegerTag]) ifTrue: - (self primitiveDoMixedArithmetic and: [tagBits = self smallIntegerTag]) ifTrue: [^(self integerValueOf: floatOrIntOop) asFloat]] ifFalse: [(self classIndexOf: floatOrIntOop) = ClassFloatCompactIndex ifTrue: [self cCode: '' inSmalltalk: [result := Float new: 2]. self fetchFloatAt: floatOrIntOop + self baseHeaderSize into: result. ^result]]. coInterpreter primitiveFail. ^0.0! Item was changed: ----- Method: StackInterpreter>>primitiveFloatEqual:toArg: (in category 'comparison float primitives') ----- primitiveFloatEqual: rcvrOop toArg: argOop | rcvr arg | <var: #rcvr type: #double> <var: #arg type: #double> rcvr := objectMemory loadFloatOrIntFrom: rcvrOop. arg := objectMemory loadFloatOrIntFrom: argOop. self cppIf: objectMemory wordSize > 4 ifTrue: [rcvr = arg ifTrue: + [(objectMemory isIntegerObject: argOop) - [(self isIntegerObject: argOop) ifTrue: ["Resolve case of ambiguity so as to have comparison of exact values" + ^ rcvr asInteger = (objectMemory integerValueOf: argOop)] + ifFalse: [(objectMemory isIntegerObject: rcvrOop) - ^ rcvr asInteger = (self integerValueOf: argOop)] - ifFalse: [(self isIntegerObject: rcvrOop) ifTrue: ["Same when used from bytecodePrim... note that rcvr and arg cannot be both integer (case is already handled)" + ^ (objectMemory integerValueOf: rcvrOop) = arg asInteger]]]]. - ^ (self integerValueOf: rcvrOop) = arg asInteger]]]]. ^rcvr = arg! Item was changed: ----- Method: StackInterpreter>>primitiveFloatGreater:thanArg: (in category 'comparison float primitives') ----- primitiveFloatGreater: rcvrOop thanArg: argOop | rcvr arg | <var: #rcvr type: #double> <var: #arg type: #double> rcvr := objectMemory loadFloatOrIntFrom: rcvrOop. arg := objectMemory loadFloatOrIntFrom: argOop. self cppIf: objectMemory wordSize > 4 ifTrue: [rcvr = arg ifTrue: + [(objectMemory isIntegerObject: argOop) - [(self isIntegerObject: argOop) ifTrue: ["Resolve case of ambiguity so as to have comparison of exact values" + ^ rcvr asInteger > (objectMemory integerValueOf: argOop)] + ifFalse: [(objectMemory isIntegerObject: rcvrOop) - ^ rcvr asInteger > (self integerValueOf: argOop)] - ifFalse: [(self isIntegerObject: rcvrOop) ifTrue: ["Same when used from bytecodePrim... note that rcvr and arg cannot be both integer (case is already handled)" + ^ (objectMemory integerValueOf: rcvrOop) > arg asInteger]]]]. - ^ (self integerValueOf: rcvrOop) > arg asInteger]]]]. ^rcvr > arg! Item was changed: ----- Method: StackInterpreter>>primitiveFloatGreaterOrEqual:toArg: (in category 'comparison float primitives') ----- primitiveFloatGreaterOrEqual: rcvrOop toArg: argOop | rcvr arg | <var: #rcvr type: #double> <var: #arg type: #double> rcvr := objectMemory loadFloatOrIntFrom: rcvrOop. arg := objectMemory loadFloatOrIntFrom: argOop. self cppIf: objectMemory wordSize > 4 ifTrue: [rcvr = arg ifTrue: + [(objectMemory isIntegerObject: argOop) - [(self isIntegerObject: argOop) ifTrue: ["Resolve case of ambiguity so as to have comparison of exact values" + ^ rcvr asInteger >= (objectMemory integerValueOf: argOop)] + ifFalse: [(objectMemory isIntegerObject: rcvrOop) - ^ rcvr asInteger >= (self integerValueOf: argOop)] - ifFalse: [(self isIntegerObject: rcvrOop) ifTrue: ["Same when used from bytecodePrim... note that rcvr and arg cannot be both integer (case is already handled)" + ^ (objectMemory integerValueOf: rcvrOop) >= arg asInteger]]]]. - ^ (self integerValueOf: rcvrOop) >= arg asInteger]]]]. ^rcvr >= arg! Item was changed: ----- Method: StackInterpreter>>primitiveFloatLess:thanArg: (in category 'comparison float primitives') ----- primitiveFloatLess: rcvrOop thanArg: argOop | rcvr arg | <var: #rcvr type: #double> <var: #arg type: #double> rcvr := objectMemory loadFloatOrIntFrom: rcvrOop. arg := objectMemory loadFloatOrIntFrom: argOop. self cppIf: objectMemory wordSize > 4 ifTrue: [rcvr = arg ifTrue: + [(objectMemory isIntegerObject: argOop) - [(self isIntegerObject: argOop) ifTrue: ["Resolve case of ambiguity so as to have comparison of exact values" + ^ rcvr asInteger < (objectMemory integerValueOf: argOop)] + ifFalse: [(objectMemory isIntegerObject: rcvrOop) - ^ rcvr asInteger < (self integerValueOf: argOop)] - ifFalse: [(self isIntegerObject: rcvrOop) ifTrue: ["Same when used from bytecodePrim... note that rcvr and arg cannot be both integer (case is already handled)" + ^ (objectMemory integerValueOf: rcvrOop) < arg asInteger]]]]. - ^ (self integerValueOf: rcvrOop) < arg asInteger]]]]. ^rcvr < arg! Item was changed: ----- Method: StackInterpreter>>primitiveFloatLessOrEqual:toArg: (in category 'comparison float primitives') ----- primitiveFloatLessOrEqual: rcvrOop toArg: argOop | rcvr arg | <var: #rcvr type: #double> <var: #arg type: #double> rcvr := objectMemory loadFloatOrIntFrom: rcvrOop. arg := objectMemory loadFloatOrIntFrom: argOop. self cppIf: objectMemory wordSize > 4 ifTrue: [rcvr = arg ifTrue: + [(objectMemory isIntegerObject: argOop) - [(self isIntegerObject: argOop) ifTrue: ["Resolve case of ambiguity so as to have comparison of exact values" + ^ rcvr asInteger <= (objectMemory integerValueOf: argOop)] + ifFalse: [(objectMemory isIntegerObject: rcvrOop) - ^ rcvr asInteger <= (self integerValueOf: argOop)] - ifFalse: [(self isIntegerObject: rcvrOop) ifTrue: ["Same when used from bytecodePrim... note that rcvr and arg cannot be both integer (case is already handled)" + ^ (objectMemory integerValueOf: rcvrOop) <= arg asInteger]]]]. - ^ (self integerValueOf: rcvrOop) <= arg asInteger]]]]. ^rcvr <= arg!

2 2

VM Maker: VMMaker.oscog-nice.2548.mcz
by commits＠source.squeak.org 05 Sep '19

05 Sep '19

Nicolas Cellier uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-nice.2548.mcz ==================== Summary ==================== Name: VMMaker.oscog-nice.2548 Author: nice Time: 5 September 2019, 11:45:21.497902 am UUID: 7e9a5859-39bb-054c-9e30-ecb8fab97761 Ancestors: VMMaker.oscog-nice.2547 Provide a more simulator friendly primitiveHighBit. If the simulator can fake a '__GNUC__' defined, or '_MSC_VER', , then it should be able to emulate the primitive behavior. Eliot, I hope it helps... =============== Diff against VMMaker.oscog-nice.2547 =============== Item was changed: ----- Method: InterpreterPrimitives>>primitiveHighBit (in category 'arithmetic integer primitives') ----- primitiveHighBit | integerReceiverOop leadingZeroCount highestBitZeroBased | integerReceiverOop := self stackTop. "Convert the receiver Oop to use a single tag bit" self numSmallIntegerTagBits > 1 ifTrue: [integerReceiverOop := (integerReceiverOop >>> (self numSmallIntegerTagBits-1) bitOr: 1)]. self cppIf: #'__GNUC__' defined ifTrue: ["Note: in gcc, result is undefined if input is zero (for compatibility with BSR fallback when no CLZ instruction available). but input is never zero because we pass the oop with tag bits set, so we are safe" objectMemory wordSize = 4 ifTrue: [leadingZeroCount := self __builtin_clz: integerReceiverOop] ifFalse: [leadingZeroCount := self __builtin_clzll: integerReceiverOop]. leadingZeroCount = 0 ifTrue: ["highBit is not defined for negative Integer" self primitiveFail] ifFalse: ["Nice bit trick: 1-based high-bit is (32 - clz) - 1 to account for tag bit. This is like two-complement - clz - 1 on 5 bits, or in other words a bit-invert operation clz ^16r1F" + self pop: 1 thenPushInteger: (leadingZeroCount bitXor: (BytesPerWord * 8 - 1))]. + ^self]. + self cppIf: #'__GNUC__' defined not & (#'_MSC_VER' defined | #'__ICC' defined) + ifTrue: + ["In MSVC, _lzcnt and _lzcnt64 builtins do not fallback to BSR when not supported by CPU + Instead of messing with __cpuid() we always use the BSR intrinsic" + + "Trick: we test the oop sign rather than the integerValue. Assume oop are signed (so far, they are, sqInt are signed)" + integerReceiverOop < 0 ifTrue: [self primitiveFail] ifFalse: [ + "Setting this variable is useless, but VMMaker will generate it at a worse place" + highestBitZeroBased := 0. + "We do not even test the return value, because integerReceiverOop is never zero" + self cCode: [objectMemory wordSize = 4 - self pop: 1 thenPushInteger: (leadingZeroCount bitXor: (BytesPerWord * 8 - 1))]] - ifFalse: [self cppIf: #'_MSC_VER' defined - ifTrue: - ["In MSVC, _lzcnt and _lzcnt64 builtins do not fallback to BSR when not supported by CPU - Instead of messing with __cpuid() we always use the BSR intrinsic" - - "Trick: we test the oop sign rather than the integerValue. Assume oop are signed (so far, they are, sqInt are signed)" - integerReceiverOop < 0 ifTrue: [self primitiveFail] ifFalse: [ - "Setting this variable is useless, but VMMaker will generate it at a worse place" - highestBitZeroBased := 0. - "We do not even test the return value, because integerReceiverOop is never zero" - objectMemory wordSize = 4 ifTrue: [self _BitScanReverse: highestBitZeroBased address _: integerReceiverOop] + ifFalse: [self _BitScanReverse64: highestBitZeroBased address _: integerReceiverOop]] + inSmalltalk: [highestBitZeroBased := integerReceiverOop highBit - 1]. + "thanks to the tag bit, the +1 operation for getting 1-based rank is not necessary" + self pop: 1 thenPushInteger: highestBitZeroBased]. + ^self]. + self cppIf: #'__GNUC__' defined not & #'_MSC_VER' defined not & #'__ICC' defined not + ifTrue: + ["not gcc/clang, nor MSVC/ICC, you have to implement if your compiler provide useful builtins" + self primitiveFail].! - ifFalse: [self _BitScanReverse64: highestBitZeroBased address _: integerReceiverOop]. - "thanks to the tag bit, the +1 operation for getting 1-based rank is not necessary" - self pop: 1 thenPushInteger: highestBitZeroBased]] - ifFalse: - ["not gcc/clang, nor MSVC, you have to implement if your compiler provide useful builtins" - self primitiveFail]].! Item was changed: ----- Method: VMBasicConstants class>>namesDefinedAtCompileTime (in category 'C translation') ----- namesDefinedAtCompileTime "Answer the set of names for variables that should be defined at compile time. Some of these get default values during simulation, and hence get defaulted in the various initializeMiscConstants methods. But that they have values should /not/ cause the code generator to do dead code elimination based on their default values. In particular, methods marked with <option: ANameDefinedAtCompileTime> will be emitted within #if defined(ANameDefinedAtCompileTime)...#endif." ^#( VMBIGENDIAN IMMUTABILITY STACKVM COGVM COGMTVM SPURVM PharoVM "Pharo vs Squeak" TerfVM "Terf vs Squeak" EnforceAccessControl "Newspeak" CheckRememberedInTrampoline "IMMUTABILITY" LLDB "As of lldb-370.0.42 Swift-3.1, passing funciton parameters to printOopsSuchThat fails with Internal error [IRForTarget]: Couldn't rewrite one of the arguments of a function call. Turning off link time optimization with -fno-lto has no effect. hence we define some debugging functions as being <option: LLDB>" "processor related" __ARM_ARCH__ __arm__ __arm32__ ARM32 __arm64__ ARM64 _M_I386 _X86_ i386 i486 i586 i686 __i386__ __386__ X86 I386 x86_64 __amd64 __x86_64 __amd64__ __x86_64__ _M_AMD64 _M_X64 + "Compiler brand related" + __GNUC__ + _MSC_VER + __ICC + "os related" ACORN - __GNUC__ __linux__ __MINGW32__ __OpenBSD__ __osf__ UNIX WIN32 _WIN32 _WIN32_WCE WIN64 _WIN64 _WIN64_WCE)! Item was added: + ----- Method: VMClass>>__builtin_clz: (in category 'C library simulation') ----- + __builtin_clz: anInteger + <doNotGenerate> + anInteger < 0 ifTrue: [^0]. + ^32 - anInteger highBit! Item was added: + ----- Method: VMClass>>__builtin_clzll: (in category 'C library simulation') ----- + __builtin_clzll: anInteger + <doNotGenerate> + anInteger < 0 ifTrue: [^0]. + ^64 - anInteger highBitOfMagnitude!

1 0

VM Maker Inbox: VMMaker.oscog-nice.2547.mcz
by commits＠source.squeak.org 05 Sep '19

05 Sep '19

Nicolas Cellier uploaded a new version of VMMaker to project VM Maker Inbox: http://source.squeak.org/VMMakerInbox/VMMaker.oscog-nice.2547.mcz ==================== Summary ==================== Name: VMMaker.oscog-nice.2547 Author: nice Time: 31 August 2019, 2:02:51.22464 am UUID: 66e4c466-c54c-4035-a7fa-6078386cbc66 Ancestors: VMMaker.oscog-nice.2546 Fix genPrimitiveHighBit We must not modify ReceiverResultReg when we CompletePrimitive (in case of negative receiver). Hence, like in WIN64, we must better use TempReg. =============== Diff against VMMaker.oscog-nice.2546 =============== Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveHighBit (in category 'primitive generators') ----- genPrimitiveHighBit + "Implementation notes: there are two reasons to use TempReg + -1) if primitive fails, ReceiverResultReg must remain unchanged (we CompletePrimitive) + -2) CLZ/BSR only work on 64bits for registers R0-R7 on Intel X64. But Win64 uses R9 + Normally, this should be backEnd dependent, but for now we have a single 64bits target..." + | jumpNegativeReceiver | <var: #jumpNegativeReceiver type: #'AbstractInstruction *'> "remove excess tag bits from the receiver oop" + cogit MoveR: ReceiverResultReg R: TempReg. self numSmallIntegerTagBits > 1 ifTrue: + [cogit OrCq: 1 << self numSmallIntegerTagBits - 1 R: TempReg. + cogit ArithmeticShiftRightCq: self numSmallIntegerTagBits - 1 R: TempReg]. - [cogit OrCq: 1 << self numSmallIntegerTagBits - 1 R: ReceiverResultReg. - cogit ArithmeticShiftRightCq: self numSmallIntegerTagBits - 1 R: ReceiverResultReg]. "and use the abstract cogit facility for case of single tag-bit" + jumpNegativeReceiver := cogit genHighBitIn: TempReg ofSmallIntegerOopWithSingleTagBit: TempReg. - jumpNegativeReceiver := cogit genHighBitIn: ReceiverResultReg ofSmallIntegerOopWithSingleTagBit: ReceiverResultReg. "Jump is NULL if above operation is not implemented, else return the result" jumpNegativeReceiver = 0 ifFalse: + [cogit MoveR: TempReg R: ReceiverResultReg. + cogit genConvertIntegerToSmallIntegerInReg: ReceiverResultReg. - [cogit genConvertIntegerToSmallIntegerInReg: ReceiverResultReg. cogit genPrimReturn. jumpNegativeReceiver jmpTarget: cogit Label]. ^CompletePrimitive! Item was removed: - ----- Method: CogObjectRepresentation>>genPrimitiveHighBitgenPrimitiveHighBit (in category 'primitive generators') ----- - genPrimitiveHighBitgenPrimitiveHighBit - | jumpNegativeReceiver | - <var: #jumpNegativeReceiver type: #'AbstractInstruction *'> - "remove excess tag bits from the receiver oop" - self numSmallIntegerTagBits > 1 - ifTrue: - [cogit OrCw: 1 << self numSmallIntegerTagBits - 1 R: ReceiverResultReg. - cogit ArithmeticShiftRightCq: self numSmallIntegerTagBits - 1 R: ReceiverResultReg]. - "and use the abstract cogit facility for case of single tag-bit" - jumpNegativeReceiver := cogit genHighBitIn: ReceiverResultReg ofSmallIntegerOopWithSingleTagBit: ReceiverResultReg. - "The jump instruction is NULL when backend does not really has a jitted implementation: fallback to normal primitive" - jumpNegativeReceiver = 0 ifTrue: [^CompletePrimitive]. - cogit genPrimReturn. - jumpNegativeReceiver jmpTarget: cogit Label. - ^UnimplementedPrimitive! Item was removed: - ----- Method: CogObjectRepresentationFor64BitSpur>>genPrimitiveHighBit (in category 'primitive generators') ----- - genPrimitiveHighBit - "Implementation notes: same as super, but CLZ/BSR only work on 64bits for registers R0-R7 on Intel X64. - Normally, this should be backEnd dependent, but for now we have a single 64bits target..." - | jumpNegativeReceiver reg | - <var: #jumpNegativeReceiver type: #'AbstractInstruction *'> - "remove excess tag bits from the receiver oop" - - ReceiverResultReg > 7 - ifTrue: [cogit MoveR: ReceiverResultReg R: (reg := TempReg)] - ifFalse: [reg := ReceiverResultReg]. - self numSmallIntegerTagBits > 1 - ifTrue: - [cogit OrCw: 1 << self numSmallIntegerTagBits - 1 R: reg. - cogit ArithmeticShiftRightCq: self numSmallIntegerTagBits - 1 R: reg]. - "and use the abstract cogit facility for case of single tag-bit" - jumpNegativeReceiver := cogit genHighBitIn: reg ofSmallIntegerOopWithSingleTagBit: reg. - "Jump is NULL if above operation is not implemented, else return the result" - jumpNegativeReceiver = 0 - ifFalse: - [ReceiverResultReg > 7 - ifTrue: [cogit MoveR: reg R: ReceiverResultReg]. - cogit genConvertIntegerToSmallIntegerInReg: ReceiverResultReg. - cogit genPrimReturn. - jumpNegativeReceiver jmpTarget: cogit Label]. - ^CompletePrimitive!

3 5

Errored: OpenSmalltalk/opensmalltalk-vm#1805 (Cog - d6238b2)
by Travis CI 04 Sep '19

04 Sep '19

Build Update for OpenSmalltalk/opensmalltalk-vm ------------------------------------- Build: #1805 Status: Errored Duration: 2 hrs, 33 mins, and 33 secs Commit: d6238b2 (Cog) Author: Nicolas Cellier Message: Merge pull request #424 from OpenSmalltalk/restore_large_cursor_support Restore support for large cursor on linux X11 VM Note: this fix only test the availability of header, and whether the library is required or not. It does not test the case when library is required but absent. The fix solve the large cursor problem, so it is considered good enough. It will be time to improve later if ever somebody barks (other distribs, openbsd, etc...) View the changeset: https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/4b644ad1b069...d6… View the full build log and details: https://travis-ci.org/OpenSmalltalk/opensmalltalk-vm/builds/580821151?utm_m… -- You can unsubscribe from build emails from the OpenSmalltalk/opensmalltalk-vm repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=8795279&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

3 2

VM Maker: VMMaker.oscog-nice.2547.mcz
by commits＠source.squeak.org 04 Sep '19

04 Sep '19

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-nice.2547.mcz ==================== Summary ==================== Name: VMMaker.oscog-nice.2547 Author: nice Time: 31 August 2019, 2:02:51.22464 am UUID: 66e4c466-c54c-4035-a7fa-6078386cbc66 Ancestors: VMMaker.oscog-nice.2546 Fix genPrimitiveHighBit We must not modify ReceiverResultReg when we CompletePrimitive (in case of negative receiver). Hence, like in WIN64, we must better use TempReg. =============== Diff against VMMaker.oscog-nice.2546 =============== Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveHighBit (in category 'primitive generators') ----- genPrimitiveHighBit + "Implementation notes: there are two reasons to use TempReg + -1) if primitive fails, ReceiverResultReg must remain unchanged (we CompletePrimitive) + -2) CLZ/BSR only work on 64bits for registers R0-R7 on Intel X64. But Win64 uses R9 + Normally, this should be backEnd dependent, but for now we have a single 64bits target..." + | jumpNegativeReceiver | <var: #jumpNegativeReceiver type: #'AbstractInstruction *'> "remove excess tag bits from the receiver oop" + cogit MoveR: ReceiverResultReg R: TempReg. self numSmallIntegerTagBits > 1 ifTrue: + [cogit OrCq: 1 << self numSmallIntegerTagBits - 1 R: TempReg. + cogit ArithmeticShiftRightCq: self numSmallIntegerTagBits - 1 R: TempReg]. - [cogit OrCq: 1 << self numSmallIntegerTagBits - 1 R: ReceiverResultReg. - cogit ArithmeticShiftRightCq: self numSmallIntegerTagBits - 1 R: ReceiverResultReg]. "and use the abstract cogit facility for case of single tag-bit" + jumpNegativeReceiver := cogit genHighBitIn: TempReg ofSmallIntegerOopWithSingleTagBit: TempReg. - jumpNegativeReceiver := cogit genHighBitIn: ReceiverResultReg ofSmallIntegerOopWithSingleTagBit: ReceiverResultReg. "Jump is NULL if above operation is not implemented, else return the result" jumpNegativeReceiver = 0 ifFalse: + [cogit MoveR: TempReg R: ReceiverResultReg. + cogit genConvertIntegerToSmallIntegerInReg: ReceiverResultReg. - [cogit genConvertIntegerToSmallIntegerInReg: ReceiverResultReg. cogit genPrimReturn. jumpNegativeReceiver jmpTarget: cogit Label]. ^CompletePrimitive! Item was removed: - ----- Method: CogObjectRepresentation>>genPrimitiveHighBitgenPrimitiveHighBit (in category 'primitive generators') ----- - genPrimitiveHighBitgenPrimitiveHighBit - | jumpNegativeReceiver | - <var: #jumpNegativeReceiver type: #'AbstractInstruction *'> - "remove excess tag bits from the receiver oop" - self numSmallIntegerTagBits > 1 - ifTrue: - [cogit OrCw: 1 << self numSmallIntegerTagBits - 1 R: ReceiverResultReg. - cogit ArithmeticShiftRightCq: self numSmallIntegerTagBits - 1 R: ReceiverResultReg]. - "and use the abstract cogit facility for case of single tag-bit" - jumpNegativeReceiver := cogit genHighBitIn: ReceiverResultReg ofSmallIntegerOopWithSingleTagBit: ReceiverResultReg. - "The jump instruction is NULL when backend does not really has a jitted implementation: fallback to normal primitive" - jumpNegativeReceiver = 0 ifTrue: [^CompletePrimitive]. - cogit genPrimReturn. - jumpNegativeReceiver jmpTarget: cogit Label. - ^UnimplementedPrimitive! Item was removed: - ----- Method: CogObjectRepresentationFor64BitSpur>>genPrimitiveHighBit (in category 'primitive generators') ----- - genPrimitiveHighBit - "Implementation notes: same as super, but CLZ/BSR only work on 64bits for registers R0-R7 on Intel X64. - Normally, this should be backEnd dependent, but for now we have a single 64bits target..." - | jumpNegativeReceiver reg | - <var: #jumpNegativeReceiver type: #'AbstractInstruction *'> - "remove excess tag bits from the receiver oop" - - ReceiverResultReg > 7 - ifTrue: [cogit MoveR: ReceiverResultReg R: (reg := TempReg)] - ifFalse: [reg := ReceiverResultReg]. - self numSmallIntegerTagBits > 1 - ifTrue: - [cogit OrCw: 1 << self numSmallIntegerTagBits - 1 R: reg. - cogit ArithmeticShiftRightCq: self numSmallIntegerTagBits - 1 R: reg]. - "and use the abstract cogit facility for case of single tag-bit" - jumpNegativeReceiver := cogit genHighBitIn: reg ofSmallIntegerOopWithSingleTagBit: reg. - "Jump is NULL if above operation is not implemented, else return the result" - jumpNegativeReceiver = 0 - ifFalse: - [ReceiverResultReg > 7 - ifTrue: [cogit MoveR: reg R: ReceiverResultReg]. - cogit genConvertIntegerToSmallIntegerInReg: ReceiverResultReg. - cogit genPrimReturn. - jumpNegativeReceiver jmpTarget: cogit Label]. - ^CompletePrimitive!

1 0

VM Maker: VMMaker.oscog-nice.2546.mcz
by commits＠source.squeak.org 04 Sep '19

04 Sep '19

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-nice.2546.mcz ==================== Summary ==================== Name: VMMaker.oscog-nice.2546 Author: nice Time: 29 August 2019, 1:17:48.054344 am UUID: a6a8d0a3-4f7c-4927-85c1-e99f2c7b2591 Ancestors: VMMaker.oscog-nice.2545 Grrr, fixup What this invert: dance really serve for? Due to this, I reread the method twice or thrice, and still make a mistake from time to time... =============== Diff against VMMaker.oscog-nice.2545 =============== Item was changed: ----- Method: CogObjectRepresentation>>genPrimitiveLessOrEqual (in category 'primitive generators') ----- genPrimitiveLessOrEqual ^self getPrimitiveDoMixedArithmetic ifTrue: [self genSmallIntegerComparison: JumpLessOrEqual orDoubleComparison: #JumpFPGreaterOrEqual: + invert: true] - invert: false] ifFalse: [self genSmallIntegerComparison: JumpLessOrEqual]!

1 0

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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev September 2019