Vm-dev September 2021

vm-dev@lists.squeakfoundation.org

15 participants
137 discussions

VM Maker: VMMaker.oscog-eem.3056.mcz
by commits＠source.squeak.org 06 Sep '21

06 Sep '21

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.3056.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.3056 Author: eem Time: 5 September 2021, 6:36:28.446042 pm UUID: b1ccff9a-d6c7-455f-b22c-3dedf3116454 Ancestors: VMMaker.oscog-eem.3055 Oops; VMMaker.oscog-eem.3051 regressed primitiveSetOrHasIdentityHash; remember to convert from SmallInteger to inetger and validate the hash is in range. FFTPlugin: mark primitives with FastCPrimitiveFlag & FastCPrimitiveAlignForFloatsFlag. Save a few cycles in marshalling. =============== Diff against VMMaker.oscog-eem.3055 =============== Item was changed: ----- Method: FFTPlugin>>loadFFTFrom: (in category 'private') ----- loadFFTFrom: fftOop | oop | + "N.B. no need to check for an object here because there is a guard in + slotSizeOf: and slotSizeOf: anImmediate = 0" interpreterProxy success: (interpreterProxy slotSizeOf: fftOop) >= 6. interpreterProxy failed ifTrue:[^false]. nu := interpreterProxy fetchInteger: 0 ofObject: fftOop. fftSize := interpreterProxy fetchInteger: 1 ofObject: fftOop. oop := interpreterProxy fetchPointer: 2 ofObject: fftOop. sinTableSize := interpreterProxy stSizeOf: oop. sinTable := self checkedFloatPtrOf: oop. oop := interpreterProxy fetchPointer: 3 ofObject: fftOop. permTableSize := interpreterProxy stSizeOf: oop. permTable := self checkedWordPtrOf: oop. oop := interpreterProxy fetchPointer: 4 ofObject: fftOop. realDataSize := interpreterProxy stSizeOf: oop. realData := self checkedFloatPtrOf: oop. oop := interpreterProxy fetchPointer: 5 ofObject: fftOop. imagDataSize := interpreterProxy stSizeOf: oop. imagData := self checkedFloatPtrOf: oop. "Check assumptions about sizes" interpreterProxy success: (1 << nu = fftSize) & (fftSize // 4 + 1 = sinTableSize) & (fftSize = realDataSize) & (fftSize = imagDataSize) & (realDataSize = imagDataSize). ^interpreterProxy failed == false! Item was changed: ----- Method: FFTPlugin>>permuteData (in category 'transforming') ----- permuteData | i end a b tmp | + <var: 'tmp' type: #float> - <var: #tmp type: 'float '> i := 0. end := permTableSize. [i < end] whileTrue: [a := (permTable at: i) - 1. b := (permTable at: i+1) - 1. (a < realDataSize and:[b < realDataSize]) ifFalse:[^interpreterProxy success: false]. tmp := realData at: a. realData at: a put: (realData at: b). realData at: b put: tmp. tmp := imagData at: a. imagData at: a put: (imagData at: b). imagData at: b put: tmp. i := i + 2]! Item was changed: ----- Method: FFTPlugin>>primitiveFFTPermuteData (in category 'primitives') ----- primitiveFFTPermuteData + <export: true flags: #(FastCPrimitiveFlag FastCPrimitiveAlignForFloatsFlag)> + (self loadFFTFrom: (interpreterProxy stackValue: 0)) ifFalse:[^nil]. - | rcvr | - <export: true> - rcvr := interpreterProxy stackObjectValue: 0. - (self loadFFTFrom: rcvr) ifFalse:[^nil]. self permuteData. + interpreterProxy failed ifTrue: - interpreterProxy failed ifTrue:[ "permuteData went wrong. Do the permutation again -- this will restore the original order" + [self permuteData].! - self permuteData].! Item was changed: ----- Method: FFTPlugin>>primitiveFFTScaleData (in category 'primitives') ----- primitiveFFTScaleData + <export: true flags: #(FastCPrimitiveFlag FastCPrimitiveAlignForFloatsFlag)> + (self loadFFTFrom: (interpreterProxy stackValue: 0)) ifFalse:[^nil]. + self scaleData! - | rcvr | - <export: true> - rcvr := interpreterProxy stackObjectValue: 0. - (self loadFFTFrom: rcvr) ifFalse:[^nil]. - self scaleData.! Item was changed: ----- Method: FFTPlugin>>primitiveFFTTransformData (in category 'primitives') ----- primitiveFFTTransformData + <export: true flags: #(FastCPrimitiveFlag FastCPrimitiveAlignForFloatsFlag)> + | forward | - | rcvr forward | - <export: true> forward := interpreterProxy booleanValueOf: (interpreterProxy stackValue: 0). + (self loadFFTFrom: (interpreterProxy stackValue: 1)) ifFalse:[^nil]. - rcvr := interpreterProxy stackObjectValue: 1. - (self loadFFTFrom: rcvr) ifFalse:[^nil]. self transformData: forward. + interpreterProxy failed ifFalse: + [interpreterProxy pop: 1] "Leave rcvr on stack"! - interpreterProxy failed ifFalse:[ - interpreterProxy pop: 1. "Leave rcvr on stack" - ].! Item was changed: ----- Method: FFTPlugin>>scaleData (in category 'transforming') ----- scaleData "Scale all elements by 1/n when doing inverse" | realN | + <var: 'realN' type: #float> - <var: #realN type: 'float '> fftSize <= 1 ifTrue:[^nil]. + realN := self cCoerce: (1.0 / (self cCoerce: fftSize to: #double)) to: #float. - realN := self cCoerce: (1.0 / (self cCoerce: fftSize to: 'double')) to: 'float'. 0 to: fftSize-1 do: [:i | realData at: i put: (realData at: i) * realN. imagData at: i put: (imagData at: i) * realN]! Item was changed: ----- Method: FFTPlugin>>transformForward: (in category 'transforming') ----- transformForward: forward | lev lev1 ip theta realU imagU realT imagT i fftSize2 fftSize4 fftScale ii | + <var: 'realU' type: #float> + <var: 'realT' type: #float> + <var: 'imagU' type: #float> + <var: 'imagT' type: #float> - <var: #realU type:'float '> - <var: #realT type:'float '> - <var: #imagU type:'float '> - <var: #imagT type:'float '> fftSize2 := fftSize // 2. fftSize4 := fftSize // 4. 1 to: nu do: [:level | lev := 1 << level. lev1 := lev // 2. fftScale := fftSize // lev. 1 to: lev1 do: [:j | theta := j-1 * fftScale. "pi * (j-1) / lev1 mapped onto 0..n/2" theta < fftSize4 "Compute U, the complex multiplier for each level" ifTrue: [realU := sinTable at: sinTableSize - theta - 1. imagU := sinTable at: theta] ifFalse: [realU := 0.0 - (sinTable at: theta - fftSize4). imagU := sinTable at: fftSize2 - theta]. forward ifFalse: [imagU := 0.0 - imagU]. " Here is the inner loop... j to: n by: lev do: [:i | hand-transformed to whileTrue... " i := j. [i <= fftSize] whileTrue: [ip := i + lev1 - 1. ii := i-1. realT := ((realData at: ip) * realU) - ((imagData at: ip) * imagU). imagT := ((realData at: ip) * imagU) + ((imagData at: ip) * realU). realData at: ip put: (realData at: ii) - realT. imagData at: ip put: (imagData at: ii) - imagT. realData at: ii put: (realData at: ii) + realT. imagData at: ii put: (imagData at: ii) + imagT. i := i + lev]]].! Item was changed: ----- Method: InterpreterPrimitives>>primitiveSetOrHasIdentityHash (in category 'object access primitives') ----- primitiveSetOrHasIdentityHash | hash oldHash thisReceiver isReceiverAClass | argumentCount = 0 ifTrue: [| hasHash | hasHash := (objectMemory isNonImmediate: self stackTop) and: [objectMemory hasIdentityHash: self stackTop]. ^self methodReturnBool: hasHash]. isReceiverAClass := false. argumentCount = 2 ifTrue: [| lastArg | lastArg := self stackTop. (objectMemory isIntegerObject: lastArg) ifTrue: "e.g. Symbol primitiveSetIdentityHashOf: aSymbol to: hash" [hash := lastArg. thisReceiver := self stackValue: 1] ifFalse: "anObject primitiveSetIdentityHash: hashValue isBehavior: boolean" [thisReceiver := self stackValue: 2. hash := self stackValue: 1. lastArg = objectMemory trueObject ifTrue: [isReceiverAClass := true] ifFalse: [lastArg = objectMemory falseObject ifFalse: [^self primitiveFailFor: PrimErrBadArgument]]]] ifFalse: "anObject primitiveSetIdentityHashTo: hash" [thisReceiver := self stackValue: 1. hash := self stackTop]. + ((objectMemory isIntegerObject: hash) + and: [((hash := objectMemory integerValueOf: hash) bitAnd: objectMemory maxIdentityHash) = hash]) ifFalse: - (objectMemory isIntegerObject: hash) ifFalse: [^self primitiveFailFor: PrimErrBadArgument]. (objectMemory isNonImmediate: thisReceiver) ifFalse: [^self primitiveFailFor: (thisReceiver = (self stackValue: argumentCount) ifTrue: [PrimErrBadReceiver] ifFalse: [PrimErrBadArgument])]. oldHash := objectMemory hashBitsOf: thisReceiver. objectMemory setHashBitsOf: thisReceiver to: hash. (isReceiverAClass and: [objectMemory hasSpurMemoryManagerAPI]) ifTrue: [objectMemory classAtIndex: hash put: thisReceiver. "this figures out if the index is ambiguous and fixes all the instances if needed" objectMemory allInstancesOf: thisReceiver]. self methodReturnInteger: oldHash!

1 0

[OpenSmalltalk/opensmalltalk-vm] e9ce78: Let make uninistall-squeak honor $(scriptname)
by David T Lewis 05 Sep '21

05 Sep '21

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: e9ce788a443a145d63b91e3fb63e9db69652ee73 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/e9ce788a443a145d63… Author: David T. Lewis <lewis(a)mail.msen.com> Date: 2021-09-05 (Sun, 05 Sep 2021) Changed paths: M platforms/unix/config/Makefile.install Log Message: ----------- Let make uninistall-squeak honor $(scriptname) If the squeak run script is renamed to e.g. spur64, then uninstall-squeak should uninstall that script.

1 0

[OpenSmalltalk/opensmalltalk-vm] 927ea6: Use distinct VERSION_TAG based on sizeof(void *) t...
by David T Lewis 05 Sep '21

05 Sep '21

Branch: refs/heads/dtl/distinct-VERSION_TAG Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 927ea6efa74d79fef0918e1ee39a12336b8a97c4 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/927ea6efa74d79fef0… Author: David T. Lewis <lewis(a)mail.msen.com> Date: 2021-09-05 (Sun, 05 Sep 2021) Changed paths: M platforms/Cross/vm/sqSCCSVersion.h Log Message: ----------- Use distinct VERSION_TAG based on sizeof(void *) to distinguish 32/64 bit installation libraries. VERSION_TAG is used for naming the installation directory, append "-32bit" or -"64bit" to VERSION_TAG to enable 32-bit and 64-bit VMs to be installed side by side in standard unix directories.

1 0

[OpenSmalltalk/opensmalltalk-vm] 62f09c: CogVM source as per VMMaker.oscog-eem.3055
by Eliot Miranda 05 Sep '21

05 Sep '21

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 62f09c732ca0094d6a774327d701700fb82f4389 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/62f09c732ca0094d6a… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2021-09-05 (Sun, 05 Sep 2021) Changed paths: M src/spur32.cog.lowcode/cogit.h M src/spur32.cog.lowcode/cogitARMv5.c M src/spur32.cog.lowcode/cogitIA32.c M src/spur32.cog/cogit.h M src/spur32.cog/cogitARMv5.c M src/spur32.cog/cogitIA32.c M src/spur32.sista/cogit.h M src/spur32.sista/cogitARMv5.c M src/spur32.sista/cogitIA32.c M src/spur64.cog.lowcode/cogit.h M src/spur64.cog.lowcode/cogitARMv8.c M src/spur64.cog.lowcode/cogitX64SysV.c M src/spur64.cog.lowcode/cogitX64WIN64.c M src/spur64.cog/cogit.h M src/spur64.cog/cogitARMv8.c M src/spur64.cog/cogitX64SysV.c M src/spur64.cog/cogitX64WIN64.c M src/spur64.sista/cogit.h M src/spur64.sista/cogitARMv8.c M src/spur64.sista/cogitX64SysV.c M src/spur64.sista/cogitX64WIN64.c M src/v3.cog/cogit.h M src/v3.cog/cogitARMv5.c M src/v3.cog/cogitIA32.c Log Message: ----------- CogVM source as per VMMaker.oscog-eem.3055 ...and numRegArgs has to work as a function invocation.

1 0

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

05 Sep '21

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.3055.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.3055 Author: eem Time: 5 September 2021, 7:56:54.82501 am UUID: 76ea7bc2-f1a4-429f-8205-433af9b5143e Ancestors: VMMaker.oscog-eem.3054 ...and numRegArgs has to work as a function invocation. =============== Diff against VMMaker.oscog-eem.3054 =============== Item was changed: ----- Method: CogObjectRepresentationForSpur>>numRegArgs (in category 'calling convention') ----- numRegArgs "Define how many register arguments a StackToRegisterMappingCogit can and should use with the receiver. The value must be 0, 1 or 2. Note that a SimpleStackBasedCogit always has 0 register args (although the receiver is passed in a register). The Spur object representation is simple enough that implementing at:put: is straight-forward and hence 2 register args are worth while. The method must be inlined in CoInterpreter, and dead code eliminated so that the register-popping enilopmarts such as enterRegisterArgCogMethod:- at:receiver: do not have to be implemented in SimpleStackBasedCogit." <api> <option: #StackToRegisterMappingCogit> + <cmacro: '() 2'> "to allow inlining optimization across the CoInterpreter/Cogit api..." - <cmacro: ' 2'> "to allow inlining optimization across the CoInterpreter/Cogit api..." ^2! Item was changed: ----- Method: CogObjectRepresentationForSqueakV3>>numRegArgs (in category 'calling convention') ----- numRegArgs "Define how many register arguments a StackToRegisterMappingCogit can and should use with the receiver. The value must be 0, 1 or 2. Note that a SimpleStackBasedCogit always has 0 register args (although the receiver is passed in a register). CogObjectRepresentationForSqueakV3 only implements at most 1-arg primitives, because the complexity of the object representation makes it difficult to implement at:put:, the most performance-critical 2-argument primitive.. The method must be inlined in CoInterpreter, and dead code eliminated so that the register-popping enilopmarts such as enterRegisterArgCogMethod:- at:receiver: do not have to be implemented in SimpleStackBasedCogit." <api> <option: #StackToRegisterMappingCogit> + <cmacro: '() 1'> "to allow inlining optimization across the CoInterpreter/Cogit api..." - <cmacro: ' 1'> "to allow inlining optimization across the CoInterpreter/Cogit api..." ^1! Item was changed: ----- Method: SimpleStackBasedCogit>>numRegArgs (in category 'testing') ----- numRegArgs <api> + <cmacro: '() 0'> "to allow inlining optimization across the CoInterpreter/Cogit api..." - <cmacro: ' 0'> "to allow inlining optimization across the CoInterpreter/Cogit api..." ^0!

1 0

[OpenSmalltalk/opensmalltalk-vm] 906b38: CogVM source as per VMMaker.oscog-eem.3054
by Eliot Miranda 05 Sep '21

05 Sep '21

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 906b38062e0dab9f4cffe726b86b9e2a71849f7e https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/906b38062e0dab9f4c… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2021-09-05 (Sun, 05 Sep 2021) Changed paths: M src/spur32.cog.lowcode/cogit.h M src/spur32.cog.lowcode/cogitARMv5.c M src/spur32.cog.lowcode/cogitIA32.c M src/spur32.cog.lowcode/cointerp.c M src/spur32.cog.lowcode/cointerp.h M src/spur32.cog.lowcode/gcc3x-cointerp.c M src/spur32.cog/cogit.h M src/spur32.cog/cogitARMv5.c M src/spur32.cog/cogitIA32.c M src/spur32.sista/cogit.h M src/spur32.sista/cogitARMv5.c M src/spur32.sista/cogitIA32.c M src/spur32.sista/cointerp.c M src/spur32.sista/cointerp.h M src/spur32.sista/gcc3x-cointerp.c M src/spur64.cog.lowcode/cogit.h M src/spur64.cog.lowcode/cogitARMv8.c M src/spur64.cog.lowcode/cogitX64SysV.c M src/spur64.cog.lowcode/cogitX64WIN64.c M src/spur64.cog.lowcode/cointerp.c M src/spur64.cog.lowcode/cointerp.h M src/spur64.cog.lowcode/gcc3x-cointerp.c M src/spur64.cog/cogit.h M src/spur64.cog/cogitARMv8.c M src/spur64.cog/cogitX64SysV.c M src/spur64.cog/cogitX64WIN64.c M src/spur64.sista/cogit.h M src/spur64.sista/cogitARMv8.c M src/spur64.sista/cogitX64SysV.c M src/spur64.sista/cogitX64WIN64.c M src/spur64.sista/cointerp.c M src/spur64.sista/cointerp.h M src/spur64.sista/gcc3x-cointerp.c M src/v3.cog/cogit.h M src/v3.cog/cogitARMv5.c M src/v3.cog/cogitIA32.c Log Message: ----------- CogVM source as per VMMaker.oscog-eem.3054 Slang: Oops! to support option: #Cog Cogit has to state that it hasCogit. ...and define numRegArgs as a macro to allow inlining optimization across the CoInterpreter/Cogit api.

1 0

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

05 Sep '21

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.3054.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.3054 Author: eem Time: 5 September 2021, 7:45:12.786068 am UUID: 577cca1d-b013-4a51-b6f3-02489bb1e7ff Ancestors: VMMaker.oscog-eem.3053 ...and define numRegArgs as a macro to allow inlining optimization across the CoInterpreter/Cogit api. =============== Diff against VMMaker.oscog-eem.3053 =============== Item was changed: ----- Method: CogObjectRepresentationForSpur>>numRegArgs (in category 'calling convention') ----- numRegArgs "Define how many register arguments a StackToRegisterMappingCogit can and should use with the receiver. The value must be 0, 1 or 2. Note that a SimpleStackBasedCogit always has 0 register args (although the receiver is passed in a register). The Spur object representation is simple enough that implementing at:put: is straight-forward and hence 2 register args are worth while. The method must be inlined in CoInterpreter, and dead code eliminated so that the register-popping enilopmarts such as enterRegisterArgCogMethod:- at:receiver: do not have to be implemented in SimpleStackBasedCogit." <api> <option: #StackToRegisterMappingCogit> + <cmacro: ' 2'> "to allow inlining optimization across the CoInterpreter/Cogit api..." ^2! Item was changed: ----- Method: CogObjectRepresentationForSqueakV3>>numRegArgs (in category 'calling convention') ----- numRegArgs "Define how many register arguments a StackToRegisterMappingCogit can and should use with the receiver. The value must be 0, 1 or 2. Note that a SimpleStackBasedCogit always has 0 register args (although the receiver is passed in a register). CogObjectRepresentationForSqueakV3 only implements at most 1-arg primitives, because the complexity of the object representation makes it difficult to implement at:put:, the most performance-critical 2-argument primitive.. The method must be inlined in CoInterpreter, and dead code eliminated so that the register-popping enilopmarts such as enterRegisterArgCogMethod:- at:receiver: do not have to be implemented in SimpleStackBasedCogit." <api> <option: #StackToRegisterMappingCogit> + <cmacro: ' 1'> "to allow inlining optimization across the CoInterpreter/Cogit api..." ^1! Item was changed: ----- Method: SimpleStackBasedCogit>>numRegArgs (in category 'testing') ----- numRegArgs <api> + <cmacro: ' 0'> "to allow inlining optimization across the CoInterpreter/Cogit api..." ^0!

1 0

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

05 Sep '21

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.3053.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.3053 Author: eem Time: 5 September 2021, 7:38:03.675807 am UUID: c8004c5a-bca9-40f2-9e4f-4453ddb3970b Ancestors: VMMaker.oscog-eem.3052 Slang: Oops! to support option: #Cog Cogit has to state that it hasCogit. =============== Diff against VMMaker.oscog-eem.3052 =============== Item was added: + ----- Method: Cogit class>>hasCogit (in category 'accessing class hierarchy') ----- + hasCogit + ^true!

1 0

[OpenSmalltalk/opensmalltalk-vm] 1ed9f1: CogVM source as per VMMaker.oscog-eem.3052
by Eliot Miranda 05 Sep '21

05 Sep '21

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 1ed9f1497085e9d7f37167f2c9b79b14ad673d43 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/1ed9f1497085e9d7f3… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2021-09-05 (Sun, 05 Sep 2021) Changed paths: M src/ckformat.c M src/plugins/FloatArrayPlugin/FloatArrayPlugin.c M src/spur32.cog.lowcode/cogit.h M src/spur32.cog.lowcode/cointerp.c M src/spur32.cog.lowcode/cointerp.h M src/spur32.cog.lowcode/gcc3x-cointerp.c M src/spur32.cog/cogit.h M src/spur32.cog/cointerp.c M src/spur32.cog/cointerp.h M src/spur32.cog/cointerpmt.c M src/spur32.cog/cointerpmt.h M src/spur32.cog/gcc3x-cointerp.c M src/spur32.cog/gcc3x-cointerpmt.c M src/spur32.sista/cogit.h M src/spur32.sista/cointerp.c M src/spur32.sista/cointerp.h M src/spur32.sista/gcc3x-cointerp.c M src/spur32.stack.lowcode/gcc3x-interp.c M src/spur32.stack.lowcode/interp.c M src/spur32.stack/gcc3x-interp.c M src/spur32.stack/interp.c M src/spur32.stack/validImage.c M src/spur64.cog.lowcode/cogit.h M src/spur64.cog.lowcode/cointerp.c M src/spur64.cog.lowcode/cointerp.h M src/spur64.cog.lowcode/gcc3x-cointerp.c M src/spur64.cog/cogit.h M src/spur64.cog/cointerp.c M src/spur64.cog/cointerp.h M src/spur64.cog/cointerpmt.c M src/spur64.cog/cointerpmt.h M src/spur64.cog/gcc3x-cointerp.c M src/spur64.cog/gcc3x-cointerpmt.c M src/spur64.sista/cogit.h M src/spur64.sista/cointerp.c M src/spur64.sista/cointerp.h M src/spur64.sista/gcc3x-cointerp.c M src/spur64.stack.lowcode/gcc3x-interp.c M src/spur64.stack.lowcode/interp.c M src/spur64.stack/gcc3x-interp.c M src/spur64.stack/interp.c M src/spur64.stack/validImage.c M src/v3.cog/cogit.h M src/v3.cog/cointerp.c M src/v3.cog/cointerp.h M src/v3.cog/gcc3x-cointerp.c M src/v3.stack/gcc3x-interp.c M src/v3.stack/interp.c Log Message: ----------- CogVM source as per VMMaker.oscog-eem.3052 CoInterpreter: Run primitiveCopyObject on the Smalltalk stack (for Symbol>>intern:). Have primitiveSetOrHasIdentityHash support all of e.g. Symbol primitiveSetIdentityHashOf: aSymbol to: hash anObject primitiveSetIdentityHash: hashValue isBehavior: boolean anObject primitiveSetIdentityHashTo: hash Fix a spelling error PrimNumberUnoadModule => PrimNumberUnloadModule Don't generate receiverTagBitsForMethod: in non-Cog VMs.

1 0

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

05 Sep '21

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.3052.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.3052 Author: eem Time: 5 September 2021, 7:18:04.242112 am UUID: d3f4107c-e267-4a0d-a8f5-a212ea858ee6 Ancestors: VMMaker.oscog-eem.3051 Slang: Don't generate receiverTagBitsForMethod: in non-Cog VMs. Neither SPURVM nor SpurMemoryManager are official option: names; SpurObjectMemory is. =============== Diff against VMMaker.oscog-eem.3051 =============== Item was changed: ----- Method: CCodeGenerator>>optionIsFalse:in: (in category 'utilities') ----- optionIsFalse: key in: aClass "Answer whether a notOption: is false in the context of aClass. The key either a Cogit class name or a class variable name or a variable name in VMBasicConstants." + "If the option is the name of a subclass of Cogit, include it if it doesn't inherit from the Cogit class." - "If the option is the name of a subclass of Cogit, include it if it dfoesn't inherit from the Cogit class." (Smalltalk classNamed: key) ifNotNil: [:optionClass| + vmClass hasCogit + ifTrue: + [aClass cogitClass + ifNotNil: + [:cogitClass| + (optionClass includesBehavior: Cogit) ifTrue: + [^(cogitClass includesBehavior: optionClass) not]]] + ifFalse: + [(optionClass includesBehavior: Cogit) ifTrue: + [^true]]. - aClass cogitClass ifNotNil: - [:cogitClass| - (optionClass includesBehavior: Cogit) ifTrue: - [^(cogitClass includesBehavior: optionClass) not]]. aClass objectMemoryClass ifNotNil: [:objectMemoryClass| ((optionClass includesBehavior: ObjectMemory) or: [optionClass includesBehavior: SpurMemoryManager]) ifTrue: [^(objectMemoryClass includesBehavior: optionClass) not]]]. "Lookup options in options, class variables of the defining class, VMBasicConstants, the interpreterClass and the objectMemoryClass" {aClass initializationOptions. aClass. VMBasicConstants. aClass interpreterClass. aClass objectMemoryClass} do: [:scopeOrNil| scopeOrNil ifNotNil: [:scope| (scope bindingOf: key) ifNotNil: [:binding| binding value ~~ true ifTrue: [^true]]]]. ^false! Item was changed: ----- Method: CCodeGenerator>>optionIsTrue:in: (in category 'utilities') ----- optionIsTrue: key in: aClass "Answer whether an option: is true in the context of aClass. The key either a Cogit class name or a class variable name or a variable name in VMBasicConstants." "If the option is the name of a subclass of Cogit, include it if it inherits from the Cogit class." (Smalltalk classNamed: key) ifNotNil: [:optionClass| + vmClass hasCogit + ifTrue: + [aClass cogitClass + ifNotNil: + [:cogitClass| + (optionClass includesBehavior: Cogit) ifTrue: + [^cogitClass includesBehavior: optionClass]]] + ifFalse: + [(optionClass includesBehavior: Cogit) ifTrue: + [^false]]. - aClass cogitClass ifNotNil: - [:cogitClass| - (optionClass includesBehavior: Cogit) ifTrue: - [^cogitClass includesBehavior: optionClass]]. aClass objectMemoryClass ifNotNil: [:objectMemoryClass| ((optionClass includesBehavior: ObjectMemory) or: [optionClass includesBehavior: SpurMemoryManager]) ifTrue: [^objectMemoryClass includesBehavior: optionClass]]]. "Lookup options in options, class variables of the defining class, VMBasicConstants, the interpreterClass and the objectMemoryClass" {aClass initializationOptions. aClass. VMBasicConstants. aClass interpreterClass. aClass objectMemoryClass} do: [:scopeOrNil| scopeOrNil ifNotNil: [:scope| (scope bindingOf: key) ifNotNil: [:binding| binding value ~~ false ifTrue: [^true]]]]. ^false! Item was changed: ----- Method: CoInterpreter>>accessorDepthForExternalPrimitiveMethod: (in category 'plugin primitive support') ----- accessorDepthForExternalPrimitiveMethod: methodObj + <option: #SpurObjectMemory> - <option: #SpurMemoryManager> | flags lit | self assert: (self isLinkedExternalPrimitive: methodObj). lit := self literal: 0 ofMethod: methodObj. flags := objectMemory fetchPointer: ExternalCallLiteralFlagsIndex ofObject: lit. ^(objectMemory integerValueOf: flags) >>> SpurPrimitiveAccessorDepthShift! Item was changed: ----- Method: FloatArrayPlugin>>primitiveFromFloat64Array (in category 'access primitives') ----- primitiveFromFloat64Array "Primitive. Set each element of the receiver, a FloatArray with that of the argument, a Float64Array and return the receiver. Note that this conversion might loose bits, or generate overflow. Fail if both have different size" + <option: #SpurObjectMemory> <export: true flags: #(FastCPrimitiveFlag FastCPrimitiveAlignForFloatsFlag)> | rcvr arg rcvrPtr argPtr length | - <option: #SPURVM> <var: #rcvrPtr type: #'float *'> <var: #argPtr type: #'double *'> arg := interpreterProxy stackValue: 0. rcvr := interpreterProxy stackValue: 1. ((interpreterProxy isLong64s: arg) and: [(interpreterProxy isWords: rcvr) and: [(length := interpreterProxy stSizeOf: arg) = (interpreterProxy stSizeOf: rcvr)]]) ifFalse: [^interpreterProxy primitiveFail]. rcvrPtr := self cCoerce: (interpreterProxy firstIndexableField: rcvr) to: #'float *'. argPtr := self cCoerce: (interpreterProxy firstIndexableField: arg) to: #'double *'. 0 to: length-1 do:[:i| rcvrPtr at: i put: (self cCoerce: (argPtr at: i) to: #float)]. ^interpreterProxy methodReturnReceiver! Item was changed: ----- Method: SpurMemoryManager>>receiverTagBitsForMethod: (in category 'cog jit support') ----- receiverTagBitsForMethod: aMethodObj "Answer the tag bits for the receiver based on the method's methodClass, if any. These bits are extended with a bit that says that the method may have a Context receiver, i.e. mclass is Context or its superclasses. The absence of this bit is used to avoid expensive store checks, etc." <api> + <option: #Cogit> | methodClassOrNil classContextOrSuperclass | methodClassOrNil := coInterpreter methodClassOf: aMethodObj. methodClassOrNil = nilObj ifTrue: "If we don't know the methodClass be pessimal" [^self maybeContextMClassTagBits]. NewspeakVM "Mixins don't necessarily have a format inst var; filter out non-integer format." ifTrue: [| instSpec | ((self isIntegerObject: (instSpec := self fetchPointer: InstanceSpecificationIndex ofObject: methodClassOrNil)) and: [(self instSpecOfClassFormat: (self integerValueOf: instSpec)) = self forwardedFormat]) ifTrue: [^self receiverTagBitsForImmediateMethodClass: methodClassOrNil]] ifFalse: [(self instSpecOfClass: methodClassOrNil) = self forwardedFormat ifTrue: [^self receiverTagBitsForImmediateMethodClass: methodClassOrNil]]. "Now check if mclass is one of Context's superclasses..." classContextOrSuperclass := self knownClassAtIndex: ClassMethodContextCompactIndex. [classContextOrSuperclass = methodClassOrNil ifTrue: [^self maybeContextMClassTagBits]. classContextOrSuperclass := self fetchPointer: SuperclassIndex ofObject: classContextOrSuperclass. classContextOrSuperclass ~= nilObj] whileTrue. ^0!

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev September 2021