Vm-dev April 2016

vm-dev@lists.squeakfoundation.org

35 participants
202 discussions

VM Maker: VMMaker.oscog-cb.1763.mcz
by commits＠source.squeak.org 05 Apr '16

05 Apr '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-cb.1763.mcz ==================== Summary ==================== Name: VMMaker.oscog-cb.1763 Author: cb Time: 5 April 2016, 11:52:00.157 am UUID: eae47156-f323-4975-880e-399822579ff1 Ancestors: VMMaker.oscog-nice.1760 Nicolas, I had to temporarily revert some of my changes.... I took your version and reapply only this single change. Sorry about that. Can you rebase form this version ? =============== Diff against VMMaker.oscog-nice.1760 =============== Item was changed: ----- Method: SistaStackToRegisterMappingCogit>>genJumpIf:to: (in category 'bytecode generator support') ----- genJumpIf: boolean to: targetBytecodePC "The heart of performance counting in Sista. Conditional branches are 6 times less frequent than sends and can provide basic block frequencies (send counters can't). Each conditional has a 32-bit counter split into an upper 16 bits counting executions and a lower half counting untaken executions of the branch. Executing the branch decrements the upper half, tripping if the count goes negative. Not taking the branch decrements the lower half. N.B. We *do not* eliminate dead branches (true ifTrue:/true ifFalse:) so that scanning for send and branch data is simplified and that branch data is correct." <inline: false> + | ok counterAddress countTripped retry nextPC nextDescriptor | - | ok counterAddress countTripped retry | <var: #ok type: #'AbstractInstruction *'> <var: #retry type: #'AbstractInstruction *'> <var: #countTripped type: #'AbstractInstruction *'> + <var: #nextDescriptor type: #'AbstractInstruction *'> (coInterpreter isOptimizedMethod: methodObj) ifTrue: [ ^ super genJumpIf: boolean to: targetBytecodePC ]. branchReachedOnlyForCounterTrip ifTrue: [ branchReachedOnlyForCounterTrip := false. ^ self genCounterTripOnlyJumpIf: boolean to: targetBytecodePC ]. + + boolean ifFalse: + [ "detection of and: / or:" + nextPC := bytecodePC + (self generatorAt: byte0) numBytes. + nextDescriptor := self generatorAt: (objectMemory fetchByte: nextPC ofObject: methodObj) + bytecodeSetOffset. + nextDescriptor generator == #genPushConstantTrueBytecode ifTrue: [ ^ super genJumpIf: boolean to: targetBytecodePC ]. + nextDescriptor := self generatorAt: (objectMemory fetchByte: targetBytecodePC ofObject: methodObj) + bytecodeSetOffset. + nextDescriptor generator == #genPushConstantFalseBytecode ifTrue: [ ^ super genJumpIf: boolean to: targetBytecodePC ]. ]. + self ssFlushTo: simStackPtr - 1. self ssTop popToReg: TempReg. self ssPop: 1. "We need SendNumArgsReg because of the mustBeBooleanTrampoline" self ssAllocateRequiredReg: SendNumArgsReg. retry := self Label. self genExecutionCountLogicInto: [ :cAddress :countTripBranch | counterAddress := cAddress. countTripped := countTripBranch ] counterReg: SendNumArgsReg. counterIndex := counterIndex + 1. "Cunning trick by LPD. If true and false are contiguous subtract the smaller. Correct result is either 0 or the distance between them. If result is not 0 or their distance send mustBeBoolean." self assert: (objectMemory objectAfter: objectMemory falseObject) = objectMemory trueObject. self annotate: (self SubCw: boolean R: TempReg) objRef: boolean. self JumpZero: (self ensureFixupAt: targetBytecodePC - initialPC). self genFallsThroughCountLogicCounterReg: SendNumArgsReg counterAddress: counterAddress. self CmpCq: (boolean == objectMemory falseObject ifTrue: [objectMemory trueObject - objectMemory falseObject] ifFalse: [objectMemory falseObject - objectMemory trueObject]) R: TempReg. ok := self JumpZero: 0. self MoveCq: 0 R: SendNumArgsReg. "if counterReg is 0 this is a mustBeBoolean, not a counter trip." countTripped jmpTarget: (self CallRT: (boolean == objectMemory falseObject ifTrue: [ceSendMustBeBooleanAddFalseTrampoline] ifFalse: [ceSendMustBeBooleanAddTrueTrampoline])). "If we're in an image which hasn't got the Sista code loaded then the ceCounterTripped: trampoline will return directly to machine code, returning the boolean. So the code should jump back to the retry point. The trampoline makes sure that TempReg has been reloaded." self annotateBytecode: self Label. self Jump: retry. ok jmpTarget: self Label. ^0!

1 0

SpurVM performance "regression"?
by Holger Freyther 05 Apr '16

05 Apr '16

Hi Guys, for one of our GSM components we have a simple decoding benchmark. The plot of the benchmark runs across Pharo builds can be seen here[1]. One can clearly see the improvement around the 15th of December 2015 when Spur was enabled in Pharo5. Around the 16th January we see a reduction in performance and the values seem to be more "noisy" as well. Today I finally had some minutes to try to reproduce this in a more stable environment and just by using Eliots VMs. I have downloaded the last build of 2015 and the four ones available for this year and executed the mini benchmark and wrote the attached script. The results can be seen in results.csv. Now is this a "real" regression or something else? E.g. if I decide to not trust the time measurement done by smalltalk itself and use "time" to execute the benchmark, I do see a similar ~500ms difference. Is this of concern? If there are more builds I am happy to bisect this further, I can make the benchmark image available as well. kind regards holger [1] https://ci.hartl.name/job/TCAP-pharo5-nightly/plot/

2 4

[commit][3668] Provide macros for conditionnally byte-swapping depending on VM endianness
by commits＠squeakvm.org 05 Apr '16

05 Apr '16

Revision: 3668 Author: nice Date: 2016-04-05 11:11:36 -0700 (Tue, 05 Apr 2016) Log Message: ----------- Provide macros for conditionnally byte-swapping depending on VM endianness Modified Paths: -------------- branches/Cog/platforms/Cross/vm/sqMemoryAccess.h Modified: branches/Cog/platforms/Cross/vm/sqMemoryAccess.h =================================================================== --- branches/Cog/platforms/Cross/vm/sqMemoryAccess.h 2016-04-02 21:58:22 UTC (rev 3667) +++ branches/Cog/platforms/Cross/vm/sqMemoryAccess.h 2016-04-05 18:11:36 UTC (rev 3668) @@ -233,7 +233,16 @@ ( (unsigned long long)(x) >> 56)) #endif +/* Since Large Integers are Bytes Oops allways stored as little endian, + the following macros are handy to retrieve 4 or 8 byte limbs */ +#if VMBIGENDIAN +# define SQ_SWAP_4_BYTES_IF_BIGENDIAN(x) SQ_SWAP_4_BYTES(x) +# define SQ_SWAP_8_BYTES_IF_BIGENDIAN(x) SQ_SWAP_8_BYTES(x) +#else +# define SQ_SWAP_4_BYTES_IF_BIGENDIAN(x) (x) +# define SQ_SWAP_8_BYTES_IF_BIGENDIAN(x) (x) + /* This doesn't belong here, but neither do 'self flag: ...'s belong in the image. We use a macro, not an inline function; we need no trace of flag. */

2 1

[commit][3669] Err, fix a slip in last commit
by commits＠squeakvm.org 05 Apr '16

05 Apr '16

Revision: 3669 Author: nice Date: 2016-04-05 11:42:16 -0700 (Tue, 05 Apr 2016) Log Message: ----------- Err, fix a slip in last commit Modified Paths: -------------- branches/Cog/platforms/Cross/vm/sqMemoryAccess.h Modified: branches/Cog/platforms/Cross/vm/sqMemoryAccess.h =================================================================== --- branches/Cog/platforms/Cross/vm/sqMemoryAccess.h 2016-04-05 18:11:36 UTC (rev 3668) +++ branches/Cog/platforms/Cross/vm/sqMemoryAccess.h 2016-04-05 18:42:16 UTC (rev 3669) @@ -241,8 +241,8 @@ #else # define SQ_SWAP_4_BYTES_IF_BIGENDIAN(x) (x) # define SQ_SWAP_8_BYTES_IF_BIGENDIAN(x) (x) +#endif - /* This doesn't belong here, but neither do 'self flag: ...'s belong in the image. We use a macro, not an inline function; we need no trace of flag. */

1 0

VM Maker: VMMaker.oscog-nice.1763.mcz
by commits＠source.squeak.org 05 Apr '16

05 Apr '16

Nicolas Cellier uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-nice.1763.mcz ==================== Summary ==================== Name: VMMaker.oscog-nice.1763 Author: nice Time: 5 April 2016, 8:19:42.268 pm UUID: 30469988-b81f-45e0-927c-bb7b9585656f Ancestors: VMMaker.oscog-nice.1760, VMMaker.oscog-cb.1762 merge VMMaker.oscog-nice.1760 (LargeIntegers changes), and VMMaker.oscog-cb.1762 (JIT changes). Warning: this requires revision 3668 of SVN http://squeakvm.org/svn/squeak/branches/Cog =============== Diff against VMMaker.oscog-nice.1760 =============== Item was changed: ----- Method: SimpleStackBasedCogit class>>initializeBytecodeTableForSistaV1 (in category 'class initialization') ----- initializeBytecodeTableForSistaV1 "SimpleStackBasedCogit initializeBytecodeTableForSistaV1" BytecodeSetHasDirectedSuperSend := true. FirstSpecialSelector := 96. NumSpecialSelectors := 32. self flag: 'Special selector send class must be inlined to agree with the interpreter, which inlines class. If class is sent to e.g. a general instance of ProtoObject then unless class is inlined there will be an MNU. It must be that the Cointerpreter and Cogit have identical semantics. We get away with not hardwiring the other special selectors either because in the Cointerpreter they are not inlined or because they are inlined only to instances of classes for which there will always be a method.'. self generatorTableFrom: #( "1 byte bytecodes" "pushes" (1 0 15 genPushReceiverVariableBytecode isInstVarRef) (1 16 31 genPushLiteralVariable16CasesBytecode needsFrameNever: 1) (1 32 63 genPushLiteralConstantBytecode needsFrameNever: 1) (1 64 75 genPushTemporaryVariableBytecode) (1 76 76 genPushReceiverBytecode) (1 77 77 genPushConstantTrueBytecode needsFrameNever: 1) (1 78 78 genPushConstantFalseBytecode needsFrameNever: 1) (1 79 79 genPushConstantNilBytecode needsFrameNever: 1) (1 80 80 genPushConstantZeroBytecode needsFrameNever: 1) (1 81 81 genPushConstantOneBytecode needsFrameNever: 1) (1 82 82 genExtPushPseudoVariable) (1 83 83 duplicateTopBytecode needsFrameNever: 1) (1 84 87 unknownBytecode) "returns" (1 88 88 genReturnReceiver return needsFrameIfInBlock: isMappedInBlock 0) (1 89 89 genReturnTrue return needsFrameIfInBlock: isMappedInBlock 0) (1 90 90 genReturnFalse return needsFrameIfInBlock: isMappedInBlock 0) (1 91 91 genReturnNil return needsFrameIfInBlock: isMappedInBlock 0) (1 92 92 genReturnTopFromMethod return needsFrameIfInBlock: isMappedInBlock -1) (1 93 93 genReturnNilFromBlock return needsFrameNever: -1) (1 94 94 genReturnTopFromBlock return needsFrameNever: -1) (1 95 95 genExtNopBytecode needsFrameNever: 0) "sends" (1 96 117 genSpecialSelectorSend isMapped) "#+ #- #< #> #<= #>= #= #~= #* #/ #\\ #@ #bitShift: #// #bitAnd: #bitOr: #at: #at:put: #size #next #nextPut: #atEnd" (1 118 118 genSpecialSelectorEqualsEquals needsFrameNever: notMapped -1) "not mapped because it is directly inlined (for now)" (1 119 119 genSpecialSelectorClass needsFrameNever: notMapped 0) "not mapped because it is directly inlined (for now)" (1 120 127 genSpecialSelectorSend isMapped) "#blockCopy: #value #value: #do: #new #new: #x #y" (1 128 143 genSendLiteralSelector0ArgsBytecode isMapped) (1 144 159 genSendLiteralSelector1ArgBytecode isMapped) (1 160 175 genSendLiteralSelector2ArgsBytecode isMapped) "jumps" (1 176 183 genShortUnconditionalJump branch v3:ShortForward:Branch:Distance:) (1 184 191 genShortJumpIfTrue branch isBranchTrue isMapped "because of mustBeBoolean" v3:ShortForward:Branch:Distance:) (1 192 199 genShortJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v3:ShortForward:Branch:Distance:) "stores" (1 200 207 genStoreAndPopReceiverVariableBytecode isInstVarRef isMappedIfImmutability needsFrameIfImmutability: -1) (1 208 215 genStoreAndPopTemporaryVariableBytecode) (1 216 216 genPopStackBytecode needsFrameNever: -1) (1 217 217 genUnconditionalTrapBytecode isMapped) (1 218 223 unknownBytecode) "2 byte bytecodes" (2 224 224 extABytecode extension) (2 225 225 extBBytecode extension) "pushes" (2 226 226 genExtPushReceiverVariableBytecode isInstVarRef) "Needs a frame for context inst var access" (2 227 227 genExtPushLiteralVariableBytecode needsFrameNever: 1) (2 228 228 genExtPushLiteralBytecode needsFrameNever: 1) (2 229 229 genLongPushTemporaryVariableBytecode) (2 230 230 genPushClosureTempsBytecode) (2 231 231 genPushNewArrayBytecode) (2 232 232 genExtPushIntegerBytecode needsFrameNever: 1) (2 233 233 genExtPushCharacterBytecode needsFrameNever: 1) "returns" "sends" (2 234 234 genExtSendBytecode isMapped) (2 235 235 genExtSendSuperBytecode isMapped) "sista bytecodes" (2 236 236 unknownBytecode) "jumps" (2 237 237 genExtUnconditionalJump branch isMapped "because of interrupt check" v4:Long:Branch:Distance:) (2 238 238 genExtJumpIfTrue branch isBranchTrue isMapped "because of mustBeBoolean" v4:Long:Branch:Distance:) (2 239 239 genExtJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v4:Long:Branch:Distance:) "stores" (2 240 240 genExtStoreAndPopReceiverVariableBytecode isInstVarRef isMappedIfImmutability) (2 241 241 genExtStoreAndPopLiteralVariableBytecode isMappedIfImmutability) (2 242 242 genLongStoreAndPopTemporaryVariableBytecode) (2 243 243 genExtStoreReceiverVariableBytecode isInstVarRef isMappedIfImmutability) (2 244 244 genExtStoreLiteralVariableBytecode isMappedIfImmutability) (2 245 245 genLongStoreTemporaryVariableBytecode) (2 246 247 unknownBytecode) "3 byte bytecodes" (3 248 248 genCallPrimitiveBytecode) (3 249 249 unknownBytecode) "reserved for Push Float" (3 250 250 genExtPushClosureBytecode block v4:Block:Code:Size:) + (3 251 251 genExtPushRemoteTempOrRemoteInstVarLongBytecode) + (3 252 252 genExtStoreRemoteTempOrRemoteInstVarLongBytecode) + (3 253 253 genExtStoreAndPopRemoteTempOrRemoteInstVarLongBytecode) - (3 251 251 genPushRemoteTempLongBytecode) - (3 252 252 genStoreRemoteTempLongBytecode) - (3 253 253 genStoreAndPopRemoteTempLongBytecode) (3 254 254 genExtJumpIfNotInstanceOfBehaviorsOrPopBytecode) (3 255 255 unknownBytecode))! Item was added: + ----- Method: SimpleStackBasedCogit>>genExtPushRemoteTempOrRemoteInstVarLongBytecode (in category 'bytecode generators') ----- + genExtPushRemoteTempOrRemoteInstVarLongBytecode + ^ (byte2 noMask: 1 << 7) + ifTrue: [ self genPushRemoteTempLongBytecode ] + ifFalse: [ self genExtPushRemoteInstVarLongBytecode ]! Item was added: + ----- Method: SimpleStackBasedCogit>>genExtStoreAndPopRemoteTempOrRemoteInstVarLongBytecode (in category 'bytecode generators') ----- + genExtStoreAndPopRemoteTempOrRemoteInstVarLongBytecode + | index | + index := byte1 + (extA << 8). + extA := 0. + ^ (byte2 noMask: 1 << 7) + ifTrue: [ self genStorePop: true RemoteTemp: byte1 At: byte2 ] + ifFalse: [ self genStorePop: true RemoteInstVar: index At: byte2 - (1 << 7) ]! Item was added: + ----- Method: SimpleStackBasedCogit>>genExtStoreRemoteTempOrRemoteInstVarLongBytecode (in category 'bytecode generators') ----- + genExtStoreRemoteTempOrRemoteInstVarLongBytecode + | index | + index := byte1 + (extA << 8). + extA := 0. + ^ (byte2 noMask: 1 << 7) + ifTrue: [ self genStorePop: false RemoteTemp: byte1 At: byte2 ] + ifFalse: [ self genStorePop: false RemoteInstVar: index At: byte2 - (1 << 7) ]! Item was changed: ----- Method: SimpleStackBasedCogit>>genJumpIf:to: (in category 'bytecode generator support') ----- genJumpIf: boolean to: targetBytecodePC <inline: false> "Cunning trick by LPD. If true and false are contiguous subtract the smaller. Correct result is either 0 or the distance between them. If result is not 0 or their distance send mustBeBoolean." | ok | <var: #ok type: #'AbstractInstruction *'> self assert: (objectMemory objectAfter: objectMemory falseObject) = objectMemory trueObject. self PopR: TempReg. self annotate: (self SubCw: boolean R: TempReg) objRef: boolean. self JumpZero: (self ensureFixupAt: targetBytecodePC - initialPC). self CmpCq: (boolean == objectMemory falseObject ifTrue: [objectMemory trueObject - objectMemory falseObject] ifFalse: [objectMemory falseObject - objectMemory trueObject]) R: TempReg. ok := self JumpZero: 0. self CallRT: (boolean == objectMemory falseObject ifTrue: [ceSendMustBeBooleanAddFalseTrampoline] ifFalse: [ceSendMustBeBooleanAddTrueTrampoline]). ok jmpTarget: (self annotateBytecode: self Label). + extA := 0. "ignores the flag" ^0! Item was added: + ----- Method: SimpleStackBasedCogit>>genPushRemoteInstVarLongBytecode (in category 'bytecode generators') ----- + genPushRemoteInstVarLongBytecode + | index | + index := byte1 + (extA << 8). + extA := 0. + self MoveMw: (self frameOffsetOfTemporary: byte2 - (1 << 7)) r: FPReg R: ClassReg. + objectRepresentation + genEnsureOopInRegNotForwarded: ClassReg + scratchReg: TempReg. + objectRepresentation + genLoadSlot: index + sourceReg: ClassReg + destReg: TempReg. + self PushR: TempReg. + ^0! Item was changed: ----- Method: SimpleStackBasedCogit>>genPushRemoteTempLongBytecode (in category 'bytecode generators') ----- genPushRemoteTempLongBytecode + extA := 0. self MoveMw: (self frameOffsetOfTemporary: byte2) r: FPReg R: ClassReg. objectRepresentation genLoadSlot: byte1 sourceReg: ClassReg destReg: TempReg. self PushR: TempReg. ^0! Item was added: + ----- Method: SimpleStackBasedCogit>>genPushRemoteTempOrRemoteInstVarLongBytecode (in category 'bytecode generators') ----- + genPushRemoteTempOrRemoteInstVarLongBytecode + ^ (byte2 noMask: 1 << 7) + ifTrue: [ self genPushRemoteTempLongBytecode ] + ifFalse: [ self genPushRemoteInstVarLongBytecode ]! Item was changed: ----- Method: SimpleStackBasedCogit>>genStorePop:LiteralVariable: (in category 'bytecode generator support') ----- genStorePop: popBoolean LiteralVariable: litVarIndex <inline: false> | association | "The only reason we assert needsFrame here is that in a frameless method ReceiverResultReg must and does contain only self, but the ceStoreCheck trampoline expects the target of the store to be in ReceiverResultReg. So in a frameless method we would have a conflict between the receiver and the literal store, unless we we smart enough to realise that ReceiverResultReg was unused after the literal variable store, unlikely given that methods return self by default." + extB := 0. "do the store check anyway" self assert: needsFrame. association := self getLiteral: litVarIndex. self genMoveConstant: association R: ReceiverResultReg. objectRepresentation genEnsureObjInRegNotForwarded: ReceiverResultReg scratchReg: TempReg. popBoolean ifTrue: [self PopR: ClassReg] ifFalse: [self MoveMw: 0 r: SPReg R: ClassReg]. self genStoreSourceReg: ClassReg slotIndex: ValueIndex destReg: ReceiverResultReg scratchReg: TempReg inFrame: needsFrame. ^0! Item was changed: ----- Method: SimpleStackBasedCogit>>genStorePop:MaybeContextReceiverVariable: (in category 'bytecode generator support') ----- genStorePop: popBoolean MaybeContextReceiverVariable: slotIndex <inline: false> | jmpSingle jmpDone | <var: #jmpSingle type: #'AbstractInstruction *'> <var: #jmpDone type: #'AbstractInstruction *'> "The reason we need a frame here is that assigning to an inst var of a context may involve wholesale reorganization of stack pages, and the only way to preserve the execution state of an activation in that case is if it has a frame." + extB := 0. "do the store check anyway" self assert: needsFrame. self putSelfInReceiverResultReg. objectRepresentation genLoadSlot: SenderIndex sourceReg: ReceiverResultReg destReg: TempReg. self MoveMw: 0 r: SPReg R: ClassReg. jmpSingle := objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg. self MoveCq: slotIndex R: SendNumArgsReg. self CallRT: ceStoreContextInstVarTrampoline. jmpDone := self Jump: 0. jmpSingle jmpTarget: self Label. popBoolean ifTrue: [self AddCq: objectMemory wordSize R: SPReg]. self genStoreSourceReg: ClassReg slotIndex: slotIndex destReg: ReceiverResultReg scratchReg: TempReg inFrame: needsFrame. jmpDone jmpTarget: self Label. ^0! Item was changed: ----- Method: SimpleStackBasedCogit>>genStorePop:ReceiverVariable: (in category 'bytecode generator support') ----- genStorePop: popBoolean ReceiverVariable: slotIndex <inline: false> + extB := 0. "do the store check anyway" needsFrame ifTrue: [self putSelfInReceiverResultReg]. popBoolean ifTrue: [self PopR: ClassReg] ifFalse: [self MoveMw: 0 r: SPReg R: ClassReg]. self genStoreSourceReg: ClassReg slotIndex: slotIndex destReg: ReceiverResultReg scratchReg: TempReg inFrame: needsFrame. ^0! Item was added: + ----- Method: SimpleStackBasedCogit>>genStorePop:RemoteInstVar:At: (in category 'bytecode generator support') ----- + genStorePop: popBoolean RemoteInstVar: slotIndex At: objectIndex + <inline: false> + "The only reason we assert needsFrame here is that in a frameless method + ReceiverResultReg must and does contain only self, but the ceStoreCheck + trampoline expects the target of the store to be in ReceiverResultReg. So + in a frameless method we would have a conflict between the receiver and + the temote temp store, unless we we smart enough to realise that + ReceiverResultReg was unused after the literal variable store, unlikely given + that methods return self by default." + extB := 0. "do the store check anyway" + self assert: needsFrame. + popBoolean + ifTrue: [self PopR: ClassReg] + ifFalse: [self MoveMw: 0 r: SPReg R: ClassReg]. + self MoveMw: (self frameOffsetOfTemporary: objectIndex) r: FPReg R: ReceiverResultReg. + objectRepresentation + genEnsureOopInRegNotForwarded: ReceiverResultReg + scratchReg: TempReg. + ^objectRepresentation + genStoreSourceReg: ClassReg + slotIndex: slotIndex + destReg: ReceiverResultReg + scratchReg: TempReg + inFrame: needsFrame! Item was changed: ----- Method: SimpleStackBasedCogit>>genStorePop:RemoteTemp:At: (in category 'bytecode generator support') ----- genStorePop: popBoolean RemoteTemp: slotIndex At: remoteTempIndex <inline: false> "The only reason we assert needsFrame here is that in a frameless method ReceiverResultReg must and does contain only self, but the ceStoreCheck trampoline expects the target of the store to be in ReceiverResultReg. So in a frameless method we would have a conflict between the receiver and the temote temp store, unless we we smart enough to realise that ReceiverResultReg was unused after the literal variable store, unlikely given that methods return self by default." + extB := 0. "do the store check anyway" self assert: needsFrame. popBoolean ifTrue: [self PopR: ClassReg] ifFalse: [self MoveMw: 0 r: SPReg R: ClassReg]. self MoveMw: (self frameOffsetOfTemporary: remoteTempIndex) r: FPReg R: ReceiverResultReg. ^objectRepresentation genStoreSourceReg: ClassReg slotIndex: slotIndex destReg: ReceiverResultReg scratchReg: TempReg inFrame: needsFrame! Item was changed: ----- Method: SistaStackToRegisterMappingCogit>>genCounterTripOnlyJumpIf:to: (in category 'bytecode generator support') ----- genCounterTripOnlyJumpIf: boolean to: targetBytecodePC "Specific version if the branch is only reached while falling through if the counter trips after an inlined #== branch. We do not regenerate the counter logic in this case to avoid 24 bytes instructions." <var: #ok type: #'AbstractInstruction *'> <var: #mustBeBooleanTrampoline type: #'AbstractInstruction *'> | ok mustBeBooleanTrampoline | + extA := 0. "reset it, we don't care if MBB not needed as we need the trampoline anyway" + self ssFlushTo: simStackPtr - 1. self ssTop popToReg: TempReg. self ssPop: 1. counterIndex := counterIndex + 1. "counters are increased / decreased in the inlined branch" "We need SendNumArgsReg because of the mustBeBooleanTrampoline" self ssAllocateRequiredReg: SendNumArgsReg. self MoveCq: 1 R: SendNumArgsReg. "The first time this is reached, it calls necessarily the counter trip for the trampoline because SendNumArgsReg is non zero" mustBeBooleanTrampoline := self CallRT: (boolean == objectMemory falseObject ifTrue: [ceSendMustBeBooleanAddFalseTrampoline] ifFalse: [ceSendMustBeBooleanAddTrueTrampoline]). self annotateBytecode: self Label. "Cunning trick by LPD. If true and false are contiguous subtract the smaller. Correct result is either 0 or the distance between them. If result is not 0 or their distance send mustBeBoolean." self assert: (objectMemory objectAfter: objectMemory falseObject) = objectMemory trueObject. self annotate: (self SubCw: boolean R: TempReg) objRef: boolean. self JumpZero: (self ensureFixupAt: targetBytecodePC - initialPC). self CmpCq: (boolean == objectMemory falseObject ifTrue: [objectMemory trueObject - objectMemory falseObject] ifFalse: [objectMemory falseObject - objectMemory trueObject]) R: TempReg. ok := self JumpZero: 0. self MoveCq: 0 R: SendNumArgsReg. "if counterReg is 0 this is a mustBeBoolean, not a counter trip." self Jump: mustBeBooleanTrampoline. ok jmpTarget: self Label. ^0! Item was changed: ----- Method: SistaStackToRegisterMappingCogit>>genJumpIf:to: (in category 'bytecode generator support') ----- genJumpIf: boolean to: targetBytecodePC "The heart of performance counting in Sista. Conditional branches are 6 times less frequent than sends and can provide basic block frequencies (send counters can't). Each conditional has a 32-bit counter split into an upper 16 bits counting executions and a lower half counting untaken executions of the branch. Executing the branch decrements the upper half, tripping if the count goes negative. Not taking the branch decrements the lower half. N.B. We *do not* eliminate dead branches (true ifTrue:/true ifFalse:) so that scanning for send and branch data is simplified and that branch data is correct." <inline: false> + | ok counterAddress countTripped retry nextDescriptor nextPC | - | ok counterAddress countTripped retry | <var: #ok type: #'AbstractInstruction *'> <var: #retry type: #'AbstractInstruction *'> <var: #countTripped type: #'AbstractInstruction *'> + <var: #nextDescriptor type: #'AbstractInstruction *'> (coInterpreter isOptimizedMethod: methodObj) ifTrue: [ ^ super genJumpIf: boolean to: targetBytecodePC ]. branchReachedOnlyForCounterTrip ifTrue: [ branchReachedOnlyForCounterTrip := false. ^ self genCounterTripOnlyJumpIf: boolean to: targetBytecodePC ]. + + boolean ifFalse: + [ "detection of and: / or:" + nextPC := bytecodePC + (self generatorAt: byte0) numBytes. + nextDescriptor := self generatorAt: (objectMemory fetchByte: nextPC ofObject: methodObj) + bytecodeSetOffset. + nextDescriptor generator == #genPushConstantTrueBytecode ifTrue: [ ^ super genJumpIf: boolean to: targetBytecodePC ]. + nextDescriptor := self generatorAt: (objectMemory fetchByte: targetBytecodePC ofObject: methodObj) + bytecodeSetOffset. + nextDescriptor generator == #genPushConstantFalseBytecode ifTrue: [ ^ super genJumpIf: boolean to: targetBytecodePC ]. ]. + extA := 0. "reset it, we don't care if MBB not needed as we need the trampoline anyway" + self ssFlushTo: simStackPtr - 1. self ssTop popToReg: TempReg. self ssPop: 1. "We need SendNumArgsReg because of the mustBeBooleanTrampoline" self ssAllocateRequiredReg: SendNumArgsReg. retry := self Label. self genExecutionCountLogicInto: [ :cAddress :countTripBranch | counterAddress := cAddress. countTripped := countTripBranch ] counterReg: SendNumArgsReg. counterIndex := counterIndex + 1. "Cunning trick by LPD. If true and false are contiguous subtract the smaller. Correct result is either 0 or the distance between them. If result is not 0 or their distance send mustBeBoolean." self assert: (objectMemory objectAfter: objectMemory falseObject) = objectMemory trueObject. self annotate: (self SubCw: boolean R: TempReg) objRef: boolean. self JumpZero: (self ensureFixupAt: targetBytecodePC - initialPC). self genFallsThroughCountLogicCounterReg: SendNumArgsReg counterAddress: counterAddress. self CmpCq: (boolean == objectMemory falseObject ifTrue: [objectMemory trueObject - objectMemory falseObject] ifFalse: [objectMemory falseObject - objectMemory trueObject]) R: TempReg. ok := self JumpZero: 0. self MoveCq: 0 R: SendNumArgsReg. "if counterReg is 0 this is a mustBeBoolean, not a counter trip." countTripped jmpTarget: (self CallRT: (boolean == objectMemory falseObject ifTrue: [ceSendMustBeBooleanAddFalseTrampoline] ifFalse: [ceSendMustBeBooleanAddTrueTrampoline])). "If we're in an image which hasn't got the Sista code loaded then the ceCounterTripped: trampoline will return directly to machine code, returning the boolean. So the code should jump back to the retry point. The trampoline makes sure that TempReg has been reloaded." self annotateBytecode: self Label. self Jump: retry. ok jmpTarget: self Label. ^0! Item was changed: ----- Method: StackInterpreter class>>initializeBytecodeTableForSistaV1 (in category 'initialization') ----- initializeBytecodeTableForSistaV1 "See e.g. the cass comment for EncoderForSistaV1" "StackInterpreter initializeBytecodeTableForSistaV1" "Note: This table will be used to generate a C switch statement." BytecodeTable := Array new: 256. BytecodeEncoderClassName := #EncoderForSistaV1. BytecodeSetHasDirectedSuperSend := true. self table: BytecodeTable from: #( "1 byte bytecodes" ( 0 15 pushReceiverVariableBytecode) ( 16 31 pushLiteralVariable16CasesBytecode) ( 32 63 pushLiteralConstantBytecode) ( 64 75 pushTemporaryVariableBytecode) ( 76 pushReceiverBytecode) ( 77 pushConstantTrueBytecode) ( 78 pushConstantFalseBytecode) ( 79 pushConstantNilBytecode) ( 80 pushConstantZeroBytecode) ( 81 pushConstantOneBytecode) ( 82 extPushPseudoVariable) ( 83 duplicateTopBytecode) ( 84 87 unknownBytecode) ( 88 returnReceiver) ( 89 returnTrue) ( 90 returnFalse) ( 91 returnNil) ( 92 returnTopFromMethod) ( 93 returnNilFromBlock) ( 94 returnTopFromBlock) ( 95 extNopBytecode) ( 96 bytecodePrimAdd) ( 97 bytecodePrimSubtract) ( 98 bytecodePrimLessThanSistaV1) "for booleanCheatSistaV1:" ( 99 bytecodePrimGreaterThanSistaV1) "for booleanCheatSistaV1:" (100 bytecodePrimLessOrEqualSistaV1) "for booleanCheatSistaV1:" (101 bytecodePrimGreaterOrEqualSistaV1) "for booleanCheatSistaV1:" (102 bytecodePrimEqualSistaV1) "for booleanCheatSistaV1:" (103 bytecodePrimNotEqualSistaV1) "for booleanCheatSistaV1:" (104 bytecodePrimMultiply) (105 bytecodePrimDivide) (106 bytecodePrimMod) (107 bytecodePrimMakePoint) (108 bytecodePrimBitShift) (109 bytecodePrimDiv) (110 bytecodePrimBitAnd) (111 bytecodePrimBitOr) (112 bytecodePrimAt) (113 bytecodePrimAtPut) (114 bytecodePrimSize) (115 bytecodePrimNext) "i.e. a 0 arg special selector" (116 bytecodePrimNextPut) "i.e. a 1 arg special selector" (117 bytecodePrimAtEnd) (118 bytecodePrimIdenticalSistaV1) "for booleanCheatSistaV1:" (119 bytecodePrimClass) (120 bytecodePrimSpecialSelector24) "was blockCopy:" (121 bytecodePrimValue) (122 bytecodePrimValueWithArg) (123 bytecodePrimDo) "i.e. a 1 arg special selector" (124 bytecodePrimNew) "i.e. a 0 arg special selector" (125 bytecodePrimNewWithArg) "i.e. a 1 arg special selector" (126 bytecodePrimPointX) "i.e. a 0 arg special selector" (127 bytecodePrimPointY) "i.e. a 0 arg special selector" (128 143 sendLiteralSelector0ArgsBytecode) (144 159 sendLiteralSelector1ArgBytecode) (160 175 sendLiteralSelector2ArgsBytecode) (176 183 shortUnconditionalJump) (184 191 shortConditionalJumpTrue) (192 199 shortConditionalJumpFalse) (200 207 storeAndPopReceiverVariableBytecode) (208 215 storeAndPopTemporaryVariableBytecode) (216 popStackBytecode) (217 unconditionnalTrapBytecode) (218 223 unknownBytecode) "2 byte bytecodes" (224 extABytecode) (225 extBBytecode) (226 extPushReceiverVariableBytecode) (227 extPushLiteralVariableBytecode) (228 extPushLiteralBytecode) (229 longPushTemporaryVariableBytecode) (230 pushClosureTempsBytecode) (231 pushNewArrayBytecode) (232 extPushIntegerBytecode) (233 extPushCharacterBytecode) (234 extSendBytecode) (235 extSendSuperBytecode) (236 unknownBytecode) (237 extUnconditionalJump) (238 extJumpIfTrue) (239 extJumpIfFalse) (240 extStoreAndPopReceiverVariableBytecode) (241 extStoreAndPopLiteralVariableBytecode) (242 longStoreAndPopTemporaryVariableBytecode) (243 extStoreReceiverVariableBytecode) (244 extStoreLiteralVariableBytecode) (245 longStoreTemporaryVariableBytecode) (246 247 unknownBytecode) "3 byte bytecodes" (248 callPrimitiveBytecode) (249 unknownBytecode) "reserved for Push Float" (250 extPushClosureBytecode) + (251 extPushRemoteTempOrRemoteInstVarLongBytecode) + (252 extStoreRemoteTempOrRemoteInstVarLongBytecode) + (253 extStoreAndPopRemoteTempOrRemoteInstVarLongBytecode) - (251 pushRemoteTempLongBytecode) - (252 storeRemoteTempLongBytecode) - (253 storeAndPopRemoteTempLongBytecode) (254 extJumpIfNotInstanceOfBehaviorsOrPopBytecode) (255 unknownBytecode) )! Item was added: + ----- Method: StackInterpreter>>extPushRemoteInstVar:inObjectAt: (in category 'stack bytecodes') ----- + extPushRemoteInstVar: byte1 inObjectAt: objectIndex + | instVarIndex object | + instVarIndex := byte1 + (extA << 8). + extA := 0. + object := self temporary: objectIndex in: localFP. + (objectMemory isForwarded: object) ifTrue: + [object := objectMemory followForwarded: object]. + self internalPush: (objectMemory fetchPointer: instVarIndex ofObject: object).! Item was added: + ----- Method: StackInterpreter>>extPushRemoteTempOrRemoteInstVarLongBytecode (in category 'stack bytecodes') ----- + extPushRemoteTempOrRemoteInstVarLongBytecode + | byte1 byte2 | + byte1 := self fetchByte. + byte2 := self fetchByte. + self fetchNextBytecode. + (byte2 noMask: 1 << 7) + ifTrue: + [ self pushRemoteTemp: byte1 inVectorAt: byte2 ] + ifFalse: + [ self extPushRemoteInstVar: byte1 inObjectAt: byte2 - (1 << 7) ] + ! Item was added: + ----- Method: StackInterpreter>>extStoreAndPopRemoteTempOrRemoteInstVarLongBytecode (in category 'stack bytecodes') ----- + extStoreAndPopRemoteTempOrRemoteInstVarLongBytecode + | byte1 byte2 | + byte1 := self fetchByte. + byte2 := self fetchByte. + self fetchNextBytecode. + (byte2 noMask: 1 << 7) + ifTrue: + [ self storeRemoteTemp: byte1 inVectorAt: byte2. + self internalPop: 1 ] + ifFalse: + [ self extStoreRemoteInstVar: byte1 inObjectAt: byte2 - (1 << 7). + self internalPop: 1 ] + ! Item was added: + ----- Method: StackInterpreter>>extStoreRemoteInstVar:inObjectAt: (in category 'stack bytecodes') ----- + extStoreRemoteInstVar: byte1 inObjectAt: objectIndex + | instVarIndex object | + instVarIndex := byte1 + (extA << 8). + extA := 0. + object := self temporary: objectIndex in: localFP. + (objectMemory isForwarded: object) ifTrue: + [object := objectMemory followForwarded: object]. + objectMemory storePointerImmutabilityCheck: instVarIndex ofObject: object withValue: self internalStackTop! Item was added: + ----- Method: StackInterpreter>>extStoreRemoteTempOrRemoteInstVarLongBytecode (in category 'stack bytecodes') ----- + extStoreRemoteTempOrRemoteInstVarLongBytecode + | byte1 byte2 | + byte1 := self fetchByte. + byte2 := self fetchByte. + self fetchNextBytecode. + (byte2 noMask: 1 << 7) + ifTrue: + [ self storeRemoteTemp: byte1 inVectorAt: byte2 ] + ifFalse: + [ self extStoreRemoteInstVar: byte1 inObjectAt: byte2 - (1 << 7) ] + ! Item was changed: ----- Method: StackToRegisterMappingCogit class>>initializeBytecodeTableForSistaV1 (in category 'class initialization') ----- initializeBytecodeTableForSistaV1 "StackToRegisterMappingCogit initializeBytecodeTableForSistaV1" numPushNilsFunction := #sistaV1:Num:Push:Nils:. pushNilSizeFunction := #sistaV1PushNilSize:numInitialNils:. BytecodeSetHasDirectedSuperSend := true. FirstSpecialSelector := 96. NumSpecialSelectors := 32. self flag: 'Special selector send class must be inlined to agree with the interpreter, which inlines class. If class is sent to e.g. a general instance of ProtoObject then unless class is inlined there will be an MNU. It must be that the Cointerpreter and Cogit have identical semantics. We get away with not hardwiring the other special selectors either because in the Cointerpreter they are not inlined or because they are inlined only to instances of classes for which there will always be a method.'. self generatorTableFrom: #( "1 byte bytecodes" "pushes" (1 0 15 genPushReceiverVariableBytecode isInstVarRef needsFrameNever: 1) (1 16 31 genPushLitVarDirSup16CasesBytecode needsFrameNever: 1) (1 32 63 genPushLiteralConstantBytecode needsFrameNever: 1) (1 64 75 genPushTemporaryVariableBytecode needsFrameIfMod16GENumArgs: 1) (1 76 76 genPushReceiverBytecode needsFrameNever: 1) (1 77 77 genPushConstantTrueBytecode needsFrameNever: 1) (1 78 78 genPushConstantFalseBytecode needsFrameNever: 1) (1 79 79 genPushConstantNilBytecode needsFrameNever: 1) (1 80 80 genPushConstantZeroBytecode needsFrameNever: 1) (1 81 81 genPushConstantOneBytecode needsFrameNever: 1) (1 82 82 genExtPushPseudoVariable) (1 83 83 duplicateTopBytecode needsFrameNever: 1) (1 84 87 unknownBytecode) "returns" (1 88 88 genReturnReceiver return needsFrameIfInBlock: isMappedInBlock 0) (1 89 89 genReturnTrue return needsFrameIfInBlock: isMappedInBlock 0) (1 90 90 genReturnFalse return needsFrameIfInBlock: isMappedInBlock 0) (1 91 91 genReturnNil return needsFrameIfInBlock: isMappedInBlock 0) (1 92 92 genReturnTopFromMethod return needsFrameIfInBlock: isMappedInBlock -1) (1 93 93 genReturnNilFromBlock return needsFrameNever: -1) (1 94 94 genReturnTopFromBlock return needsFrameNever: -1) (1 95 95 genExtNopBytecode needsFrameNever: 0) "sends" (1 96 96 genSpecialSelectorArithmetic isMapped AddRR) (1 97 97 genSpecialSelectorArithmetic isMapped SubRR) (1 98 98 genSpecialSelectorComparison isMapped JumpLess) (1 99 99 genSpecialSelectorComparison isMapped JumpGreater) (1 100 100 genSpecialSelectorComparison isMapped JumpLessOrEqual) (1 101 101 genSpecialSelectorComparison isMapped JumpGreaterOrEqual) (1 102 102 genSpecialSelectorComparison isMapped JumpZero) (1 103 103 genSpecialSelectorComparison isMapped JumpNonZero) (1 104 109 genSpecialSelectorSend isMapped) " #* #/ #\\ #@ #bitShift: //" (1 110 110 genSpecialSelectorArithmetic isMapped AndRR) (1 111 111 genSpecialSelectorArithmetic isMapped OrRR) (1 112 117 genSpecialSelectorSend isMapped) "#at: #at:put: #size #next #nextPut: #atEnd" (1 118 118 genSpecialSelectorEqualsEquals needsFrameNever: notMapped -1) "not mapped because it is directly inlined (for now)" (1 119 119 genSpecialSelectorClass needsFrameIfStackGreaterThanOne: notMapped 0) "not mapped because it is directly inlined (for now)" (1 120 127 genSpecialSelectorSend isMapped) "#blockCopy: #value #value: #do: #new #new: #x #y" (1 128 143 genSendLiteralSelector0ArgsBytecode isMapped) (1 144 159 genSendLiteralSelector1ArgBytecode isMapped) (1 160 175 genSendLiteralSelector2ArgsBytecode isMapped) "jumps" (1 176 183 genShortUnconditionalJump branch v3:ShortForward:Branch:Distance:) (1 184 191 genShortJumpIfTrue branch isBranchTrue isMapped "because of mustBeBoolean" v3:ShortForward:Branch:Distance:) (1 192 199 genShortJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v3:ShortForward:Branch:Distance:) (1 200 207 genStoreAndPopReceiverVariableBytecode isInstVarRef isMappedIfImmutability needsFrameIfImmutability: -1) (1 208 215 genStoreAndPopTemporaryVariableBytecode) (1 216 216 genPopStackBytecode needsFrameNever: -1) (1 217 217 genUnconditionalTrapBytecode isMapped) (1 218 223 unknownBytecode) "2 byte bytecodes" (2 224 224 extABytecode extension) (2 225 225 extBBytecode extension) "pushes" (2 226 226 genExtPushReceiverVariableBytecode isInstVarRef) "Needs a frame for context inst var access" (2 227 227 genExtPushLitVarDirSupBytecode needsFrameNever: 1) (2 228 228 genExtPushLiteralBytecode needsFrameNever: 1) (2 229 229 genLongPushTemporaryVariableBytecode) (2 230 230 genPushClosureTempsBytecode) (2 231 231 genPushNewArrayBytecode) (2 232 232 genExtPushIntegerBytecode needsFrameNever: 1) (2 233 233 genExtPushCharacterBytecode needsFrameNever: 1) "returns" "sends" (2 234 234 genExtSendBytecode isMapped) (2 235 235 genExtSendSuperBytecode isMapped) "sista bytecodes" (2 236 236 unknownBytecode) "jumps" (2 237 237 genExtUnconditionalJump branch isMapped "because of interrupt check" v4:Long:Branch:Distance:) (2 238 238 genExtJumpIfTrue branch isBranchTrue isMapped "because of mustBeBoolean" v4:Long:Branch:Distance:) (2 239 239 genExtJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v4:Long:Branch:Distance:) "stores" (2 240 240 genExtStoreAndPopReceiverVariableBytecode isInstVarRef isMappedIfImmutability) (2 241 241 genExtStoreAndPopLiteralVariableBytecode isMappedIfImmutability) (2 242 242 genLongStoreAndPopTemporaryVariableBytecode) (2 243 243 genExtStoreReceiverVariableBytecode isInstVarRef isMappedIfImmutability) (2 244 244 genExtStoreLiteralVariableBytecode isMappedIfImmutability) (2 245 245 genLongStoreTemporaryVariableBytecode) (2 246 247 unknownBytecode) "3 byte bytecodes" (3 248 248 genCallPrimitiveBytecode) (3 249 249 unknownBytecode) "reserved for Push Float" (3 250 250 genExtPushClosureBytecode block v4:Block:Code:Size:) + (3 251 251 genExtPushRemoteTempOrRemoteInstVarLongBytecode) + (3 252 252 genExtStoreRemoteTempOrRemoteInstVarLongBytecode) + (3 253 253 genExtStoreAndPopRemoteTempOrRemoteInstVarLongBytecode) - (3 251 251 genPushRemoteTempLongBytecode) - (3 252 252 genStoreRemoteTempLongBytecode) - (3 253 253 genStoreAndPopRemoteTempLongBytecode) (3 254 254 genExtJumpIfNotInstanceOfBehaviorsOrPopBytecode branch v4:Long:BranchIfNotInstanceOf:Distance:) (3 255 255 unknownBytecode))! Item was changed: ----- Method: StackToRegisterMappingCogit>>genImmutabilityCheckStorePop:LiteralVariable: (in category 'bytecode generator support') ----- genImmutabilityCheckStorePop: popBoolean LiteralVariable: litVarIndex <inline: true> | association needStoreCheck | "The only reason we assert needsFrame here is that in a frameless method ReceiverResultReg must and does contain only self, but the ceStoreCheck trampoline expects the target of the store to be in ReceiverResultReg. So in a frameless method we would have a conflict between the receiver and the literal store, unless we we smart enough to realise that ReceiverResultReg was unused after the literal variable store, unlikely given that methods return self by default." self assert: needsFrame. "N.B. No need to check the stack for references because we generate code for literal variable loads that stores the result in a register, deferring only the register push." + needStoreCheck := self ssTopNeedsStoreCheck. - needStoreCheck := (objectRepresentation isUnannotatableConstant: self ssTop) not. association := self getLiteral: litVarIndex. optStatus isReceiverResultRegLive: false. self ssAllocateRequiredReg: ReceiverResultReg. "for store trampoline call in genStoreSourceReg: has to be ReceiverResultReg" self genMoveConstant: association R: ReceiverResultReg. objectRepresentation genEnsureObjInRegNotForwarded: ReceiverResultReg scratchReg: TempReg. self ssAllocateRequiredReg: ClassReg. self ssStoreAndReplacePop: popBoolean toReg: ClassReg. self ssFlushTo: simStackPtr. objectRepresentation genStoreWithImmutabilityCheckSourceReg: ClassReg slotIndex: ValueIndex destReg: ReceiverResultReg scratchReg: TempReg needsStoreCheck: needStoreCheck needRestoreRcvr: false. ^ 0! Item was changed: ----- Method: StackToRegisterMappingCogit>>genImmutabilityCheckStorePop:MaybeContextReceiverVariable: (in category 'bytecode generator support') ----- genImmutabilityCheckStorePop: popBoolean MaybeContextReceiverVariable: slotIndex <inline: true> | jmpSingle jmpDone needStoreCheck | <var: #jmpSingle type: #'AbstractInstruction *'> <var: #jmpDone type: #'AbstractInstruction *'> "The reason we need a frame here is that assigning to an inst var of a context may involve wholesale reorganization of stack pages, and the only way to preserve the execution state of an activation in that case is if it has a frame." self assert: needsFrame. + needStoreCheck := self ssTopNeedsStoreCheck. - needStoreCheck := (objectRepresentation isUnannotatableConstant: self ssTop) not. "Note that ReceiverResultReg remains live after both ceStoreContextInstVarTrampoline and ceStoreCheckTrampoline." self ensureReceiverResultRegContainsSelf. self ssPop: 1. self ssAllocateCallReg: ClassReg and: SendNumArgsReg. "for ceStoreContextInstVarTrampoline" self ssPush: 1. objectRepresentation genLoadSlot: SenderIndex sourceReg: ReceiverResultReg destReg: TempReg. self ssStoreAndReplacePop: popBoolean toReg: ClassReg. "stack is flushed except maybe ssTop if popBoolean is false. ssTop is a SSregister in this case due to #ssStoreAndReplacePop: to avoid a second indirect read / annotation in case of SSConstant or SSBaseRegister" self ssFlushTo: simStackPtr. jmpSingle := objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg. self MoveCq: slotIndex R: SendNumArgsReg. self CallRT: ceStoreContextInstVarTrampoline. jmpDone := self Jump: 0. jmpSingle jmpTarget: self Label. objectRepresentation genStoreWithImmutabilityCheckSourceReg: ClassReg slotIndex: slotIndex destReg: ReceiverResultReg scratchReg: TempReg needsStoreCheck: needStoreCheck needRestoreRcvr: true. jmpDone jmpTarget: self Label. ^0! Item was changed: ----- Method: StackToRegisterMappingCogit>>genImmutabilityCheckStorePop:ReceiverVariable: (in category 'bytecode generator support') ----- genImmutabilityCheckStorePop: popBoolean ReceiverVariable: slotIndex <inline: true> | needStoreCheck | self assert: needsFrame. + needStoreCheck := self ssTopNeedsStoreCheck. - needStoreCheck := (objectRepresentation isUnannotatableConstant: self ssTop) not. "Note that ReceiverResultReg remains live after the trampoline." self ensureReceiverResultRegContainsSelf. self ssAllocateRequiredReg: ClassReg. self ssStoreAndReplacePop: popBoolean toReg: ClassReg. self ssFlushTo: simStackPtr. objectRepresentation genStoreWithImmutabilityCheckSourceReg: ClassReg slotIndex: slotIndex destReg: ReceiverResultReg scratchReg: TempReg needsStoreCheck: needStoreCheck needRestoreRcvr: true. ^ 0! Item was added: + ----- Method: StackToRegisterMappingCogit>>genImmutabilityCheckStorePop:RemoteInstVar:At: (in category 'bytecode generator support') ----- + genImmutabilityCheckStorePop: popBoolean RemoteInstVar: slotIndex At: objectIndex + <inline: true> + | needStoreCheck | + self assert: needsFrame. + needStoreCheck := self ssTopNeedsStoreCheck. + + self ssAllocateRequiredReg: ReceiverResultReg. + optStatus isReceiverResultRegLive: false. + self MoveMw: (self frameOffsetOfTemporary: objectIndex) r: FPReg R: ReceiverResultReg. + + self ssAllocateRequiredReg: ClassReg. + self ssStoreAndReplacePop: popBoolean toReg: ClassReg. + self ssFlushTo: simStackPtr. + + objectRepresentation + genEnsureOopInRegNotForwarded: ReceiverResultReg + scratchReg: TempReg. + + objectRepresentation + genStoreWithImmutabilityCheckSourceReg: ClassReg + slotIndex: slotIndex + destReg: ReceiverResultReg + scratchReg: TempReg + needsStoreCheck: needStoreCheck + needRestoreRcvr: false. + ^ 0! Item was changed: ----- Method: StackToRegisterMappingCogit>>genJumpIf:to: (in category 'bytecode generator support') ----- genJumpIf: boolean to: targetBytecodePC <inline: false> | desc fixup ok | <var: #desc type: #'CogSimStackEntry *'> <var: #fixup type: #'BytecodeFixup *'> <var: #ok type: #'AbstractInstruction *'> self ssFlushTo: simStackPtr - 1. desc := self ssTop. self ssPop: 1. (desc type == SSConstant and: [desc constant = objectMemory trueObject or: [desc constant = objectMemory falseObject]]) ifTrue: ["Must arrange there's a fixup at the target whether it is jumped to or not so that the simStackPtr can be kept correct." fixup := self ensureFixupAt: targetBytecodePC - initialPC. "Must enter any annotatedConstants into the map" desc annotateUse ifTrue: [self annotateBytecode: (self prevInstIsPCAnnotated ifTrue: [self Nop] ifFalse: [self Label])]. "Must annotate the bytecode for correct pc mapping." self annotateBytecode: (desc constant = boolean ifTrue: [self Jump: fixup] ifFalse: [self prevInstIsPCAnnotated ifTrue: [self Nop] ifFalse: [self Label]]). ^0]. desc popToReg: TempReg. + "Cunning trick by LPD. If true and false are contiguous subtract the smaller. Correct result is either 0 or the distance between them. If result is not 0 or their distance send mustBeBoolean." self assert: (objectMemory objectAfter: objectMemory falseObject) = objectMemory trueObject. self annotate: (self SubCw: boolean R: TempReg) objRef: boolean. self JumpZero: (self ensureFixupAt: targetBytecodePC - initialPC). + + (extA anyMask: 1) ifTrue: [ extA := 0. ^ 0 ]. + self assert: extA = 0. + self CmpCq: (boolean == objectMemory falseObject ifTrue: [objectMemory trueObject - objectMemory falseObject] ifFalse: [objectMemory falseObject - objectMemory trueObject]) R: TempReg. ok := self JumpZero: 0. self CallRT: (boolean == objectMemory falseObject ifTrue: [ceSendMustBeBooleanAddFalseTrampoline] ifFalse: [ceSendMustBeBooleanAddTrueTrampoline]). ok jmpTarget: (self annotateBytecode: self Label). ^0! Item was added: + ----- Method: StackToRegisterMappingCogit>>genPushRemoteInstVarLongBytecode (in category 'bytecode generators') ----- + genPushRemoteInstVarLongBytecode + | tempVectReg remoteTempReg | + tempVectReg := self allocateRegNotConflictingWith: 0. + self MoveMw: (self frameOffsetOfTemporary: byte2 - (1 << 7)) r: FPReg R: tempVectReg. + objectRepresentation + genEnsureOopInRegNotForwarded: tempVectReg + scratchReg: TempReg. + remoteTempReg := self availableRegOrNoneNotConflictingWith: (self registerMaskFor: tempVectReg). + remoteTempReg = NoReg ifTrue: [remoteTempReg := tempVectReg]. + objectRepresentation + genLoadSlot: byte1 + sourceReg: tempVectReg + destReg: remoteTempReg. + ^self ssPushRegister: remoteTempReg! Item was added: + ----- Method: StackToRegisterMappingCogit>>genStorePop:RemoteInstVar:At: (in category 'bytecode generator support') ----- + genStorePop: popBoolean RemoteInstVar: slotIndex At: objectIndex + <inline: false> + self + cppIf: IMMUTABILITY + ifTrue: [ ^ self genImmutabilityCheckStorePop: popBoolean RemoteInstVar: slotIndex At: objectIndex ] + ifFalse: [ ^ self genVanillaStorePop: popBoolean RemoteInstVar: slotIndex At: objectIndex ] + ! Item was changed: ----- Method: StackToRegisterMappingCogit>>genVanillaStorePop:LiteralVariable: (in category 'bytecode generator support') ----- genVanillaStorePop: popBoolean LiteralVariable: litVarIndex <inline: true> | topReg association needStoreCheck | "The only reason we assert needsFrame here is that in a frameless method ReceiverResultReg must and does contain only self, but the ceStoreCheck trampoline expects the target of the store to be in ReceiverResultReg. So in a frameless method we would have a conflict between the receiver and the literal store, unless we we smart enough to realise that ReceiverResultReg was unused after the literal variable store, unlikely given that methods return self by default." self assert: needsFrame. "N.B. No need to check the stack for references because we generate code for literal variable loads that stores the result in a register, deferring only the register push." + needStoreCheck := self ssTopNeedsStoreCheck. - needStoreCheck := (objectRepresentation isUnannotatableConstant: self ssTop) not. association := self getLiteral: litVarIndex. optStatus isReceiverResultRegLive: false. self ssAllocateRequiredReg: ReceiverResultReg. "for ceStoreCheck call in genStoreSourceReg: has to be ReceiverResultReg" self genMoveConstant: association R: ReceiverResultReg. objectRepresentation genEnsureObjInRegNotForwarded: ReceiverResultReg scratchReg: TempReg. topReg := self allocateRegForStackEntryAt: 0 notConflictingWith: (self registerMaskFor: ReceiverResultReg). self ssStorePop: popBoolean toReg: topReg. objectRepresentation genStoreSourceReg: topReg slotIndex: ValueIndex destReg: ReceiverResultReg scratchReg: TempReg inFrame: needsFrame needsStoreCheck: needStoreCheck. ^ 0! Item was changed: ----- Method: StackToRegisterMappingCogit>>genVanillaStorePop:MaybeContextReceiverVariable: (in category 'bytecode generator support') ----- genVanillaStorePop: popBoolean MaybeContextReceiverVariable: slotIndex <inline: true> | jmpSingle jmpDone needStoreCheck | <var: #jmpSingle type: #'AbstractInstruction *'> <var: #jmpDone type: #'AbstractInstruction *'> "The reason we need a frame here is that assigning to an inst var of a context may involve wholesale reorganization of stack pages, and the only way to preserve the execution state of an activation in that case is if it has a frame." self assert: needsFrame. self ssFlushUpThroughReceiverVariable: slotIndex. + needStoreCheck := self ssTopNeedsStoreCheck. - needStoreCheck := (objectRepresentation isUnannotatableConstant: self ssTop) not. "Note that ReceiverResultReg remains live after both ceStoreContextInstVarTrampoline and ceStoreCheckTrampoline." self ensureReceiverResultRegContainsSelf. self ssPop: 1. self ssAllocateCallReg: ClassReg and: SendNumArgsReg. "for ceStoreContextInstVarTrampoline" self ssPush: 1. objectRepresentation genLoadSlot: SenderIndex sourceReg: ReceiverResultReg destReg: TempReg. self ssStorePop: popBoolean toReg: ClassReg. jmpSingle := objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg. self MoveCq: slotIndex R: SendNumArgsReg. self CallRT: ceStoreContextInstVarTrampoline. jmpDone := self Jump: 0. jmpSingle jmpTarget: self Label. objectRepresentation genStoreSourceReg: ClassReg slotIndex: slotIndex destReg: ReceiverResultReg scratchReg: TempReg inFrame: true needsStoreCheck: needStoreCheck. jmpDone jmpTarget: self Label. ^0! Item was changed: ----- Method: StackToRegisterMappingCogit>>genVanillaStorePop:ReceiverVariable: (in category 'bytecode generator support') ----- genVanillaStorePop: popBoolean ReceiverVariable: slotIndex <inline: true> | topReg needStoreCheck | self ssFlushUpThroughReceiverVariable: slotIndex. + needStoreCheck := self ssTopNeedsStoreCheck. - needStoreCheck := (objectRepresentation isUnannotatableConstant: self ssTop) not. "Note that ReceiverResultReg remains live after ceStoreCheckTrampoline." self ensureReceiverResultRegContainsSelf. topReg := self allocateRegForStackEntryAt: 0 notConflictingWith: (self registerMaskFor: ReceiverResultReg). self ssStorePop: popBoolean toReg: topReg. objectRepresentation genStoreSourceReg: topReg slotIndex: slotIndex destReg: ReceiverResultReg scratchReg: TempReg inFrame: needsFrame needsStoreCheck: needStoreCheck. ^ 0! Item was added: + ----- Method: StackToRegisterMappingCogit>>genVanillaStorePop:RemoteInstVar:At: (in category 'bytecode generator support') ----- + genVanillaStorePop: popBoolean RemoteInstVar: slotIndex At: objectIndex + <inline: false> + | topReg needStoreCheck | + "The only reason we assert needsFrame here is that in a frameless method + ReceiverResultReg must and does contain only self, but the ceStoreCheck + trampoline expects the target of the store to be in ReceiverResultReg. So + in a frameless method we would have a conflict between the receiver and + the temote temp store, unless we we smart enough to realise that + ReceiverResultReg was unused after the literal variable store, unlikely given + that methods return self by default." + self assert: needsFrame. + "N.B. No need to check the stack for references because we generate code for + remote temp loads that stores the result in a register, deferring only the register push." + needStoreCheck := (objectRepresentation isUnannotatableConstant: self ssTop) not. + topReg := self allocateRegForStackEntryAt: 0 notConflictingWith: (self registerMaskFor: ReceiverResultReg). + self ssAllocateRequiredReg: ReceiverResultReg. + optStatus isReceiverResultRegLive: false. + self ssStorePop: popBoolean toReg: topReg. + self MoveMw: (self frameOffsetOfTemporary: objectIndex) r: FPReg R: ReceiverResultReg. + objectRepresentation + genEnsureOopInRegNotForwarded: ReceiverResultReg + scratchReg: TempReg. + ^objectRepresentation + genStoreSourceReg: topReg + slotIndex: slotIndex + destReg: ReceiverResultReg + scratchReg: TempReg + inFrame: needsFrame + needsStoreCheck: needStoreCheck! Item was added: + ----- Method: StackToRegisterMappingCogit>>ssTopNeedsStoreCheck (in category 'bytecode generator support') ----- + ssTopNeedsStoreCheck + <inline: true> + | needsStoreCheck | + needsStoreCheck := (extB noMask: 1) and: [ (objectRepresentation isUnannotatableConstant: self ssTop) not ]. + extB := 0. + ^ needsStoreCheck!

1 0

VM Maker: VMMaker.oscog-nice.1760.mcz
by commits＠source.squeak.org 05 Apr '16

05 Apr '16

Nicolas Cellier uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-nice.1760.mcz ==================== Summary ==================== Name: VMMaker.oscog-nice.1760 Author: nice Time: 3 April 2016, 10:53:08.924 pm UUID: ae64abbe-8a10-4814-95a5-d54c91e62463 Ancestors: VMMaker.oscog-nice.1759 Before updating LargeIntegersPlugin to 32bits limbs, get rid of obsolete primitives burden. =============== Diff against VMMaker.oscog-nice.1759 =============== Item was removed: - ----- Method: LargeIntegersPlugin>>primAsLargeInteger: (in category 'control & support primitives') ----- - primAsLargeInteger: anInteger - "Converts a SmallInteger into a - non normalized!! - LargeInteger; - aLargeInteger will be returned unchanged." - "Do not check for forced fail, because we need this conversion to test the - plugin in ST during forced fail, too." - self debugCode: [self msg: 'primAsLargeInteger: anInteger']. - self - primitive: 'primAsLargeInteger' - parameters: #(Integer ) - receiver: #Oop. - (interpreterProxy isIntegerObject: anInteger) - ifTrue: [^ self createLargeFromSmallInteger: anInteger] - ifFalse: [^ anInteger]! Item was removed: - ----- Method: LargeIntegersPlugin>>primCheckIfCModuleExists (in category 'obsolete') ----- - primCheckIfCModuleExists - "If calling this primitive fails, then C module does not exist. Do not check for forced fail, because we want to know if module exists during forced fail, too." - self - primitive: 'primCheckIfCModuleExists' - parameters: #() - receiver: #Oop. - ^ true asOop: Boolean! Item was removed: - ----- Method: LargeIntegersPlugin>>primDigit:bitShift: (in category 'development primitives') ----- - primDigit: anInteger bitShift: shiftCount - | rShift aLarge | - self debugCode: [self msg: 'primDigit: anInteger bitShift: shiftCount']. - self - primitive: '_primDigitBitShift' - parameters: #(Integer SmallInteger ) - receiver: #Oop. - (interpreterProxy isIntegerObject: anInteger) - ifTrue: ["convert it to a not normalized LargeInteger" - aLarge := self createLargeFromSmallInteger: anInteger] - ifFalse: [aLarge := anInteger]. - shiftCount >= 0 - ifTrue: [^ self digit: aLarge Lshift: shiftCount] - ifFalse: - [rShift := 0 - shiftCount. - ^ self normalize: (self - digit: aLarge - Rshift: rShift - lookfirst: (self digitSizeOfLargeInt: aLarge))]! Item was removed: - ----- Method: LargeIntegersPlugin>>primDigitAdd:with: (in category 'development primitives') ----- - primDigitAdd: firstInteger with: secondInteger - | firstLarge secondLarge | - self debugCode: [self msg: 'primDigitAdd: firstInteger with: secondInteger']. - self - primitive: 'primDigitAddWith' - parameters: #(Integer Integer ) - receiver: #Oop. - (interpreterProxy isIntegerObject: firstInteger) - ifTrue: ["convert it to a not normalized LargeInteger" - self remapOop: secondInteger in: [firstLarge := self createLargeFromSmallInteger: firstInteger]] - ifFalse: [firstLarge := firstInteger]. - (interpreterProxy isIntegerObject: secondInteger) - ifTrue: ["convert it to a not normalized LargeInteger" - self remapOop: firstLarge in: [secondLarge := self createLargeFromSmallInteger: secondInteger]] - ifFalse: [secondLarge := secondInteger]. - ^ self digitAddLarge: firstLarge with: secondLarge! Item was removed: - ----- Method: LargeIntegersPlugin>>primDigitBitLogic:with:op: (in category 'development primitives') ----- - primDigitBitLogic: firstInteger with: secondInteger op: opIndex - "Bit logic here is only implemented for positive integers or Zero; if any arg is negative, it fails." - self debugCode: [self msg: 'primDigitBitLogic: firstInteger with: secondInteger op: opIndex']. - self - primitive: 'primDigitBitLogicWithOp' - parameters: #(Integer Integer SmallInteger ) - receiver: #Oop. - ^ self - digitBitLogic: firstInteger - with: secondInteger - opIndex: opIndex! Item was removed: - ----- Method: LargeIntegersPlugin>>primDigitBitShift: (in category 'obsolete') ----- - primDigitBitShift: shiftCount - | rShift aLarge anInteger | - self debugCode: [self msg: 'primDigitBitShift: shiftCount']. - anInteger := self - primitive: 'primDigitBitShift' - parameters: #(SmallInteger ) - receiver: #Integer. - (interpreterProxy isIntegerObject: anInteger) - ifTrue: ["convert it to a not normalized LargeInteger" - aLarge := self createLargeFromSmallInteger: anInteger] - ifFalse: [aLarge := anInteger]. - shiftCount >= 0 - ifTrue: [^ self digit: aLarge Lshift: shiftCount] - ifFalse: - [rShift := 0 - shiftCount. - ^ self normalize: (self - digit: aLarge - Rshift: rShift - lookfirst: (self digitSizeOfLargeInt: aLarge))]! Item was removed: - ----- Method: LargeIntegersPlugin>>primDigitCompare:with: (in category 'development primitives') ----- - primDigitCompare: firstInteger with: secondInteger - | firstVal secondVal | - self debugCode: [self msg: 'primDigitCompare: firstInteger with: secondInteger']. - self - primitive: 'primDigitCompareWith' - parameters: #(Integer Integer ) - receiver: #Oop. - "shortcut: aSmallInteger has to be smaller in Magnitude as aLargeInteger" - (interpreterProxy isIntegerObject: firstInteger) - ifTrue: ["first" - (interpreterProxy isIntegerObject: secondInteger) - ifTrue: ["second" - (firstVal := interpreterProxy integerValueOf: firstInteger) > (secondVal := interpreterProxy integerValueOf: secondInteger) - ifTrue: [^ 1 asOop: SmallInteger"first > second"] - ifFalse: [firstVal < secondVal - ifTrue: [^ -1 asOop: SmallInteger"first < second"] - ifFalse: [^ 0 asOop: SmallInteger"first = second"]]] - ifFalse: ["SECOND" ^ -1 asOop: SmallInteger"first < SECOND"]] - ifFalse: ["FIRST" - (interpreterProxy isIntegerObject: secondInteger) - ifTrue: ["second" ^ 1 asOop: SmallInteger"FIRST > second"] - ifFalse: ["SECOND" - ^ self digitCompareLarge: firstInteger with: secondInteger]]! Item was removed: - ----- Method: LargeIntegersPlugin>>primDigitDiv:with:negative: (in category 'development primitives') ----- - primDigitDiv: firstInteger with: secondInteger negative: neg - "Answer the result of dividing firstInteger by secondInteger. - Fail if parameters are not integers or secondInteger is zero." - | firstAsLargeInteger secondAsLargeInteger | - self debugCode: [self msg: 'primDigitDiv: firstInteger with: secondInteger negative: neg']. - self - primitive: 'primDigitDivWithNegative' - parameters: #(Integer Integer Boolean ) - receiver: #Oop. - "Coerce SmallIntegers to corresponding (not normalized) large integers - and check for zerodivide." - (interpreterProxy isIntegerObject: firstInteger) - ifTrue: ["convert to LargeInteger" - self remapOop: secondInteger in: [firstAsLargeInteger := self createLargeFromSmallInteger: firstInteger]] - ifFalse: [firstAsLargeInteger := firstInteger]. - (interpreterProxy isIntegerObject: secondInteger) - ifTrue: - ["check for zerodivide and convert to LargeInteger" - (interpreterProxy integerValueOf: secondInteger) - = 0 ifTrue: [^ interpreterProxy primitiveFail]. - self remapOop: firstAsLargeInteger in: [secondAsLargeInteger := self createLargeFromSmallInteger: secondInteger]] - ifFalse: [secondAsLargeInteger := secondInteger]. - ^ self - digitDivLarge: firstAsLargeInteger - with: secondAsLargeInteger - negative: neg! Item was removed: - ----- Method: LargeIntegersPlugin>>primDigitMultiply:with:negative: (in category 'development primitives') ----- - primDigitMultiply: firstInteger with: secondInteger negative: neg - | firstLarge secondLarge | - self debugCode: [self msg: 'primDigitMultiply: firstInteger with: secondInteger negative: neg']. - self - primitive: 'primDigitMultiplyWithNegative' - parameters: #(Integer Integer Boolean ) - receiver: #Oop. - (interpreterProxy isIntegerObject: firstInteger) - ifTrue: ["convert it to a not normalized LargeInteger" - self remapOop: secondInteger in: [firstLarge := self createLargeFromSmallInteger: firstInteger]] - ifFalse: [firstLarge := firstInteger]. - (interpreterProxy isIntegerObject: secondInteger) - ifTrue: ["convert it to a not normalized LargeInteger" - self remapOop: firstLarge in: [secondLarge := self createLargeFromSmallInteger: secondInteger]] - ifFalse: [secondLarge := secondInteger]. - ^ self - digitMultiplyLarge: firstLarge - with: secondLarge - negative: neg! Item was removed: - ----- Method: LargeIntegersPlugin>>primDigitSubtract:with: (in category 'development primitives') ----- - primDigitSubtract: firstInteger with: secondInteger - | firstLarge secondLarge | - self debugCode: [self msg: 'primDigitSubtract: firstInteger with: secondInteger']. - self - primitive: 'primDigitSubtractWith' - parameters: #(Integer Integer ) - receiver: #Oop. - (interpreterProxy isIntegerObject: firstInteger) - ifTrue: ["convert it to a not normalized LargeInteger" - self remapOop: secondInteger in: [firstLarge := self createLargeFromSmallInteger: firstInteger]] - ifFalse: [firstLarge := firstInteger]. - (interpreterProxy isIntegerObject: secondInteger) - ifTrue: ["convert it to a not normalized LargeInteger" - self remapOop: firstLarge in: [secondLarge := self createLargeFromSmallInteger: secondInteger]] - ifFalse: [secondLarge := secondInteger]. - ^ self digitSubLarge: firstLarge with: secondLarge! Item was removed: - ----- Method: LargeIntegersPlugin>>primNormalize: (in category 'development primitives') ----- - primNormalize: anInteger - "Parameter specification #(Integer) doesn't convert!!" - self debugCode: [self msg: 'primNormalize: anInteger']. - self - primitive: 'primNormalize' - parameters: #(Integer ) - receiver: #Oop. - (interpreterProxy isIntegerObject: anInteger) - ifTrue: [^ anInteger]. - ^ self normalize: anInteger!

1 0

VM Maker: VMMaker.oscog-nice.1759.mcz
by commits＠source.squeak.org 05 Apr '16

05 Apr '16

Nicolas Cellier uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-nice.1759.mcz ==================== Summary ==================== Name: VMMaker.oscog-nice.1759 Author: nice Time: 3 April 2016, 9:26:39.76 pm UUID: 19e95bf2-b480-4986-8d9a-8345e44f3099 Ancestors: VMMaker.oscog-nice.1758 Use the new macro SQ_SWAP_4/8_BYTES_IF_BIGENDIAN to factor out proliferation of cppIf: VMBIGENDIAN. Memory is 8 bytes aligned on Spur. When storing 32/64 bits large integers values, allways fill the eight bytes whatever the effectivily used size, rather than bothering with dissertion of size. Prepare the same change for fetching 32/64 LargeIntegers values on SpurVM, but comment it out for now as it's unclear whether those oversize bytes are effectively zero for already created LargeIntegers. =============== Diff against VMMaker.oscog-nice.1758 =============== Item was added: + ----- Method: CCodeGenerator>>generateByteSwap32IfBigEndian:on:indent: (in category 'C translation') ----- + generateByteSwap32IfBigEndian: msgNode on: aStream indent: level + "Generate the C code for this message onto the given stream." + + aStream nextPutAll: #'SQ_SWAP_4_BYTES_IF_BIGENDIAN'. + aStream nextPut: $(. + self emitCExpression: msgNode args first on: aStream. + aStream nextPut: $)! Item was added: + ----- Method: CCodeGenerator>>generateByteSwap64IfBigEndian:on:indent: (in category 'C translation') ----- + generateByteSwap64IfBigEndian: msgNode on: aStream indent: level + "Generate the C code for this message onto the given stream." + + aStream nextPutAll: #'SQ_SWAP_8_BYTES_IF_BIGENDIAN'. + aStream nextPut: $(. + self emitCExpression: msgNode args first on: aStream. + aStream nextPut: $)! Item was changed: ----- Method: CCodeGenerator>>initializeCTranslationDictionary (in category 'C translation support') ----- initializeCTranslationDictionary "Initialize the dictionary mapping message names to actions for C code generation." | pairs | translationDict := Dictionary new: 200. pairs := #( #& #generateAnd:on:indent: #| #generateOr:on:indent: #abs #generateAbs:on:indent: #and: #generateSequentialAnd:on:indent: #or: #generateSequentialOr:on:indent: #not #generateNot:on:indent: #+ #generatePlus:on:indent: #- #generateMinus:on:indent: #negated #generateNegated:on:indent: #* #generateTimes:on:indent: #/ #generateDivide:on:indent: #// #generateDivide:on:indent: #\\ #generateModulo:on:indent: #<< #generateShiftLeft:on:indent: #>> #generateShiftRight:on:indent: #>>> #generateSignedShiftRight:on:indent: #min: #generateMin:on:indent: #max: #generateMax:on:indent: #between:and: #generateBetweenAnd:on:indent: #bitAnd: #generateBitAnd:on:indent: #bitOr: #generateBitOr:on:indent: #bitXor: #generateBitXor:on:indent: #bitShift: #generateBitShift:on:indent: #signedBitShift: #generateSignedBitShift:on:indent: #bitInvert32 #generateBitInvert:on:indent: #bitInvert64 #generateBitInvert:on:indent: #bitClear: #generateBitClear:on:indent: #truncateTo: #generateTruncateTo:on:indent: #rounded #generateRounded:on:indent: #byteSwap32 #generateByteSwap32:on:indent: #byteSwap64 #generateByteSwap64:on:indent: + #byteSwapped32IfBigEndian: generateByteSwap32IfBigEndian:on:indent: + #byteSwapped64IfBigEndian: generateByteSwap64IfBigEndian:on:indent: #< #generateLessThan:on:indent: #<= #generateLessThanOrEqual:on:indent: #= #generateEqual:on:indent: #> #generateGreaterThan:on:indent: #>= #generateGreaterThanOrEqual:on:indent: #~= #generateNotEqual:on:indent: #== #generateEqual:on:indent: #~~ #generateNotEqual:on:indent: #isNil #generateIsNil:on:indent: #notNil #generateNotNil:on:indent: #whileTrue: #generateWhileTrue:on:indent: #whileFalse: #generateWhileFalse:on:indent: #whileTrue #generateDoWhileTrue:on:indent: #whileFalse #generateDoWhileFalse:on:indent: #to:do: #generateToDo:on:indent: #to:by:do: #generateToByDo:on:indent: #repeat #generateRepeat:on:indent: #timesRepeat: #generateTimesRepeat:on:indent: #ifTrue: #generateIfTrue:on:indent: #ifFalse: #generateIfFalse:on:indent: #ifTrue:ifFalse: #generateIfTrueIfFalse:on:indent: #ifFalse:ifTrue: #generateIfFalseIfTrue:on:indent: #ifNotNil: #generateIfNotNil:on:indent: #ifNil: #generateIfNil:on:indent: #ifNotNil:ifNil: #generateIfNotNilIfNil:on:indent: #ifNil:ifNotNil: #generateIfNilIfNotNil:on:indent: #at: #generateAt:on:indent: #at:put: #generateAtPut:on:indent: #basicAt: #generateAt:on:indent: #basicAt:put: #generateAtPut:on:indent: #integerValueOf: #generateIntegerValueOf:on:indent: #integerObjectOf: #generateIntegerObjectOf:on:indent: #isIntegerObject: #generateIsIntegerObject:on:indent: #cCode: #generateInlineCCode:on:indent: #cCode:inSmalltalk: #generateInlineCCode:on:indent: #cPreprocessorDirective: #generateInlineCPreprocessorDirective:on:indent: #cppIf:ifTrue:ifFalse: #generateInlineCppIfElse:on:indent: #cppIf:ifTrue: #generateInlineCppIfElse:on:indent: #cCoerce:to: #generateCCoercion:on:indent: #cCoerceSimple:to: #generateCCoercion:on:indent: #addressOf: #generateAddressOf:on:indent: #addressOf:put: #generateAddressOf:on:indent: #asAddress:put: #generateAsAddress:on:indent: #signedIntFromLong64 #generateSignedIntFromLong64:on:indent: #signedIntFromLong #generateSignedIntFromLong:on:indent: #signedIntFromShort #generateSignedIntFromShort:on:indent: #signedIntToLong64 #generateSignedIntToLong64:on:indent: #signedIntToLong #generateSignedIntToLong:on:indent: #signedIntToShort #generateSignedIntToShort:on:indent: #preIncrement #generatePreIncrement:on:indent: #preDecrement #generatePreDecrement:on:indent: #inline: #generateInlineDirective:on:indent: #asFloat #generateAsFloat:on:indent: #asInteger #generateAsInteger:on:indent: #asUnsignedInteger #generateAsUnsignedInteger:on:indent: #asLong #generateAsLong:on:indent: #asUnsignedLong #generateAsUnsignedLong:on:indent: #asUnsignedLongLong #generateAsUnsignedLongLong:on:indent: #asVoidPointer #generateAsVoidPointer:on:indent: #asSymbol #generateAsSymbol:on:indent: #flag: #generateFlag:on:indent: #anyMask: #generateBitAnd:on:indent: #allMask: #generateAllMask:on:indent: #noMask: #generateNoMask:on:indent: #raisedTo: #generateRaisedTo:on:indent: #touch: #generateTouch:on:indent: #bytesPerOop #generateBytesPerOop:on:indent: #bytesPerWord #generateBytesPerWord:on:indent: #wordSize #generateBytesPerWord:on:indent: #baseHeaderSize #generateBaseHeaderSize:on:indent: #minSmallInteger #generateSmallIntegerConstant:on:indent: #maxSmallInteger #generateSmallIntegerConstant:on:indent: #sharedCodeNamed:inCase: #generateSharedCodeDirective:on:indent: #perform: #generatePerform:on:indent: #perform:with: #generatePerform:on:indent: #perform:with:with: #generatePerform:on:indent: #perform:with:with:with: #generatePerform:on:indent: #perform:with:with:with:with: #generatePerform:on:indent: #perform:with:with:with:with:with: #generatePerform:on:indent: #value #generateValue:on:indent: #value: #generateValue:on:indent: #value:value: #generateValue:on:indent: #value:value:value: #generateValue:on:indent: #value:value:value:value: #generateValue:on:indent: #deny: #generateDeny:on:indent: #shouldNotImplement #generateSmalltalkMetaError:on:indent: #shouldBeImplemented #generateSmalltalkMetaError:on:indent: #subclassResponsibility #generateSmalltalkMetaError:on:indent: ). 1 to: pairs size by: 2 do: [:i | translationDict at: (pairs at: i) put: (pairs at: i + 1)]. pairs := #( #ifTrue: #generateIfTrueAsArgument:on:indent: #ifFalse: #generateIfFalseAsArgument:on:indent: #ifTrue:ifFalse: #generateIfTrueIfFalseAsArgument:on:indent: #ifFalse:ifTrue: #generateIfFalseIfTrueAsArgument:on:indent: #ifNotNil: #generateIfNotNilAsArgument:on:indent: #ifNil: #generateIfNilAsArgument:on:indent: #ifNotNil:ifNil: #generateIfNotNilIfNilAsArgument:on:indent: #ifNil:ifNotNil: #generateIfNilIfNotNilAsArgument:on:indent: #cCode: #generateInlineCCodeAsArgument:on:indent: #cCode:inSmalltalk: #generateInlineCCodeAsArgument:on:indent: #cppIf:ifTrue:ifFalse: #generateInlineCppIfElseAsArgument:on:indent: #cppIf:ifTrue: #generateInlineCppIfElseAsArgument:on:indent: #value #generateValueAsArgument:on:indent: #value: #generateValueAsArgument:on:indent: #value:value: #generateValueAsArgument:on:indent: ). asArgumentTranslationDict := Dictionary new: 8. 1 to: pairs size by: 2 do: [:i | asArgumentTranslationDict at: (pairs at: i) put: (pairs at: i + 1)]. ! Item was changed: ----- Method: InterpreterPrimitives>>magnitude64BitIntegerFor:neg: (in category 'primitive support') ----- magnitude64BitIntegerFor: magnitude neg: isNegative "Return a Large Integer object for the given integer magnitude and sign" | newLargeInteger largeClass highWord sz isSmall smallVal | <var: 'magnitude' type: #usqLong> <var: 'highWord' type: #usqInt> isSmall := isNegative ifTrue: [magnitude <= (objectMemory maxSmallInteger + 1)] ifFalse: [magnitude <= objectMemory maxSmallInteger]. isSmall ifTrue: [smallVal := self cCoerceSimple: magnitude to: #sqInt. isNegative ifTrue: [smallVal := 0 - smallVal]. ^objectMemory integerObjectOf: smallVal]. largeClass := isNegative ifTrue: [objectMemory classLargeNegativeInteger] ifFalse: [objectMemory classLargePositiveInteger]. objectMemory wordSize = 8 ifTrue: [sz := 8] ifFalse: [(highWord := magnitude >> 32) = 0 ifTrue: [sz := 4] ifFalse: [sz := 5. (highWord := highWord >> 8) = 0 ifFalse: [sz := sz + 1. (highWord := highWord >> 8) = 0 ifFalse: [sz := sz + 1. (highWord := highWord >> 8) = 0 ifFalse: [sz := sz + 1]]]]]. newLargeInteger := objectMemory instantiateClass: largeClass indexableSize: sz. + self cppIf: SPURVM - self cppIf: VMBIGENDIAN ifTrue: + ["Memory is eight byte aligned in SPUR, so we are sure to have room for 64bits word whatever allocated sz" + objectMemory storeLong64: 0 ofObject: newLargeInteger withValue: (objectMemory byteSwapped64IfBigEndian: magnitude)] - [sz > 4 - ifTrue: [objectMemory storeLong64: 0 ofObject: newLargeInteger withValue: magnitude byteSwap64] - ifFalse: [objectMemory storeLong32: 0 ofObject: newLargeInteger withValue: (magnitude byteSwap32)]] ifFalse: [sz > 4 + ifTrue: [objectMemory storeLong64: 0 ofObject: newLargeInteger withValue: (objectMemory byteSwapped64IfBigEndian: magnitude)] + ifFalse: [objectMemory storeLong32: 0 ofObject: newLargeInteger withValue: (objectMemory byteSwapped32IfBigEndian: magnitude)]]. - ifTrue: [objectMemory storeLong64: 0 ofObject: newLargeInteger withValue: magnitude] - ifFalse: [objectMemory storeLong32: 0 ofObject: newLargeInteger withValue: (self cCode: [magnitude] inSmalltalk: [magnitude bitAnd: 16rFFFFFFFF])]]. ^newLargeInteger! Item was changed: ----- Method: InterpreterPrimitives>>magnitude64BitValueOf: (in category 'primitive support') ----- magnitude64BitValueOf: oop "Convert the given object into an integer value. The object may be either a positive SmallInteger or an eight-byte LargeInteger." | sz value ok smallIntValue | <returnTypeC: #usqLong> <var: #value type: #usqLong> (objectMemory isIntegerObject: oop) ifTrue: [smallIntValue := (objectMemory integerValueOf: oop). smallIntValue < 0 ifTrue: [smallIntValue := 0 - smallIntValue]. ^self cCoerce: smallIntValue to: #usqLong]. (objectMemory isNonIntegerImmediate: oop) ifTrue: [self primitiveFail. ^0]. ok := objectMemory isClassOfNonImm: oop equalTo: (objectMemory splObj: ClassLargePositiveInteger) compactClassIndex: ClassLargePositiveIntegerCompactIndex. ok ifFalse: [ok := objectMemory isClassOfNonImm: oop equalTo: (objectMemory splObj: ClassLargeNegativeInteger) compactClassIndex: ClassLargeNegativeIntegerCompactIndex. ok ifFalse: [self primitiveFail. ^0]]. sz := objectMemory numBytesOfBytes: oop. sz > (self sizeof: #sqLong) ifTrue: [self primitiveFail. ^0]. + "self cppIf: SPURVM - self cppIf: VMBIGENDIAN ifTrue: + [""Memory is 8 byte aligned in Spur and oversized bytes are set to zero, so we can safely fetch 8 bytes"" + value := objectMemory byteSwapped64IfBigEndian: (objectMemory fetchLong64: 0 ofObject: oop)] - [sz > 4 - ifTrue: [value := (self cCoerceSimple: (objectMemory fetchLong64: 0 ofObject: oop) to: #usqLong) byteSwap64] - ifFalse: [value := (self cCoerceSimple: (objectMemory fetchLong32: 0 ofObject: oop) to: #'unsigned int') byteSwap32].] ifFalse: + ["sz > 4 + ifTrue: [value := objectMemory byteSwapped64IfBigEndian: (objectMemory fetchLong64: 0 ofObject: oop)] + ifFalse: [value := self cCoerceSimple: (objectMemory byteSwapped32IfBigEndian: (objectMemory fetchLong32: 0 ofObject: oop)) to: #'unsigned int']"]". - [sz > 4 - ifTrue: [value := self cCoerceSimple: (objectMemory fetchLong64: 0 ofObject: oop) to: #usqLong] - ifFalse: [value := self cCoerceSimple: (objectMemory fetchLong32: 0 ofObject: oop) to: #'unsigned int'].]. ^value! Item was changed: ----- Method: InterpreterPrimitives>>positive32BitValueOf: (in category 'primitive support') ----- positive32BitValueOf: oop "Convert the given object into an integer value. The object may be either a positive SmallInteger or a four-byte LargePositiveInteger." <returnTypeC: #usqInt> | value ok sz | (objectMemory isIntegerObject: oop) ifTrue: [value := objectMemory integerValueOf: oop. (value < 0 or: [objectMemory wordSize > 4 and: [self cCode: [(self cCoerceSimple: value to: #'unsigned int') ~= value] inSmalltalk: [value >> 32 ~= 0]]]) ifTrue: [self primitiveFail. value := 0]. ^value]. (objectMemory hasSixtyFourBitImmediates or: [objectMemory isNonIntegerImmediate: oop]) ifTrue: [self primitiveFail. ^0] ifFalse: [ok := objectMemory isClassOfNonImm: oop equalTo: (objectMemory splObj: ClassLargePositiveInteger) compactClassIndex: ClassLargePositiveIntegerCompactIndex. ok ifFalse: [self primitiveFail. ^0]. sz := objectMemory numBytesOfBytes: oop. sz > 4 ifTrue: [self primitiveFail. ^0]. + ^self cCoerceSimple: (objectMemory byteSwapped32IfBigEndian: (objectMemory fetchLong32: 0 ofObject: oop)) to: #'unsigned int']! - ^self cppIf: VMBIGENDIAN - ifTrue: - [(objectMemory fetchLong32: 0 ofObject: oop) byteSwap32] - ifFalse: - [objectMemory fetchLong32: 0 ofObject: oop]]! Item was changed: ----- Method: InterpreterPrimitives>>positive64BitValueOf: (in category 'primitive support') ----- positive64BitValueOf: oop "Convert the given object into an integer value. The object may be either a positive SmallInteger or an eight-byte LargePositiveInteger." <returnTypeC: #usqLong> | sz value ok | <var: #value type: #usqLong> (objectMemory isIntegerObject: oop) ifTrue: [(objectMemory integerValueOf: oop) < 0 ifTrue: [^self primitiveFail]. ^objectMemory integerValueOf: oop]. (objectMemory isNonIntegerImmediate: oop) ifTrue: [self primitiveFail. ^0]. ok := objectMemory isClassOfNonImm: oop equalTo: (objectMemory splObj: ClassLargePositiveInteger) compactClassIndex: ClassLargePositiveIntegerCompactIndex. ok ifFalse: [self primitiveFail. ^0]. sz := objectMemory numBytesOfBytes: oop. sz > (self sizeof: #sqLong) ifTrue: [self primitiveFail. ^0]. + "self cppIf: SPURVM - self cppIf: VMBIGENDIAN ifTrue: + [""Memory is 8 byte aligned in Spur and oversized bytes are set to zero, so we can safely fetch 8 bytes"" + value := objectMemory byteSwapped64IfBigEndian: (objectMemory fetchLong64: 0 ofObject: oop)] - [sz > 4 - ifTrue: [value := (self cCoerceSimple: (objectMemory fetchLong64: 0 ofObject: oop) to: #usqLong) byteSwap64] - ifFalse: [value := (self cCoerceSimple: (objectMemory fetchLong32: 0 ofObject: oop) to: #'unsigned int') byteSwap32].] ifFalse: + ["sz > 4 + ifTrue: [value := objectMemory byteSwapped64IfBigEndian: (objectMemory fetchLong64: 0 ofObject: oop)] + ifFalse: [value := self cCoerceSimple: (objectMemory byteSwapped32IfBigEndian: (objectMemory fetchLong32: 0 ofObject: oop)) to: #'unsigned int']"]". - [sz > 4 - ifTrue: [value := self cCoerceSimple: (objectMemory fetchLong64: 0 ofObject: oop) to: #usqLong] - ifFalse: [value := self cCoerceSimple: (objectMemory fetchLong32: 0 ofObject: oop) to: #'unsigned int'].]. ^value! Item was changed: ----- Method: InterpreterPrimitives>>positiveMachineIntegerValueOf: (in category 'primitive support') ----- positiveMachineIntegerValueOf: oop "Answer a value of an integer in address range, i.e up to the size of a machine word. The object may be either a positive SmallInteger or a LargePositiveInteger of size <= word size." <returnTypeC: #'unsigned long'> <inline: true> "only two callers & one is primitiveNewWithArg" | value bs ok | (objectMemory isIntegerObject: oop) ifTrue: [value := objectMemory integerValueOf: oop. value < 0 ifTrue: [^self primitiveFail]. ^value]. (objectMemory isNonIntegerImmediate: oop) ifTrue: [self primitiveFail. ^0]. ok := objectMemory isClassOfNonImm: oop equalTo: (objectMemory splObj: ClassLargePositiveInteger) compactClassIndex: ClassLargePositiveIntegerCompactIndex. ok ifFalse: [self primitiveFail. ^0]. bs := objectMemory numBytesOfBytes: oop. bs > (self sizeof: #'unsigned long') ifTrue: [self primitiveFail. ^0]. + "self cppIf: SPURVM + ifTrue: [""Memory is 8 byte aligned in Spur and oversized bytes are set to zero, so we can safely fetch 8 bytes"" + ^objectMemory byteSwapped64IfBigEndian: (objectMemory fetchLong64: 0 ofObject: oop)] + ifFalse: ["((self sizeof: #'unsigned long') = 8 + and: [bs > 4]) - ((self sizeof: #'unsigned long') = 8 - and: [bs > 4]) ifTrue: - [^self cppIf: VMBIGENDIAN - ifTrue: - [(objectMemory fetchLong64: 0 ofObject: oop) byteSwap64] - ifFalse: - [objectMemory fetchLong64: 0 ofObject: oop]] - ifFalse: - [^self cppIf: VMBIGENDIAN ifTrue: + [^objectMemory byteSwapped64IfBigEndian: (objectMemory fetchLong64: 0 ofObject: oop)] - [(self cCoerceSimple: (objectMemory fetchLong32: 0 ofObject: oop) to: #'unsigned int') byteSwap32] ifFalse: + [^self cCoerceSimple: (objectMemory byteSwapped32IfBigEndian: (objectMemory fetchLong32: 0 ofObject: oop)) to: #'unsigned int']"]"! - [self cCoerceSimple: (objectMemory fetchLong32: 0 ofObject: oop) to: #'unsigned int']]! Item was changed: ----- Method: InterpreterPrimitives>>signed32BitValueOf: (in category 'primitive support') ----- signed32BitValueOf: oop "Convert the given object into an integer value. The object may be either a positive SmallInteger or a four-byte LargeInteger." | value negative ok magnitude | <inline: false> <returnTypeC: #int> <var: #value type: #int> <var: #magnitude type: #'unsigned int'> <var: #value64 type: #long> (objectMemory isIntegerObject: oop) ifTrue: [objectMemory wordSize = 4 ifTrue: [^objectMemory integerValueOf: oop] ifFalse: "Must fail for SmallIntegers with digitLength > 4" [| value64 | value64 := objectMemory integerValueOf: oop. (self cCode: [(self cCoerceSimple: value64 to: #int) ~= value64] inSmalltalk: [value64 >> 31 ~= 0 and: [value64 >> 31 ~= -1]]) ifTrue: [self primitiveFail. value64 := 0]. ^value64]]. (objectMemory isNonIntegerImmediate: oop) ifTrue: [self primitiveFail. ^0]. ok := objectMemory isClassOfNonImm: oop equalTo: (objectMemory splObj: ClassLargePositiveInteger) compactClassIndex: ClassLargePositiveIntegerCompactIndex. ok ifTrue: [negative := false] ifFalse: [negative := true. ok := objectMemory isClassOfNonImm: oop equalTo: (objectMemory splObj: ClassLargeNegativeInteger) compactClassIndex: ClassLargeNegativeIntegerCompactIndex. ok ifFalse: [self primitiveFail. ^0]]. (objectMemory numBytesOfBytes: oop) > 4 ifTrue: [^self primitiveFail]. + magnitude := self cCoerceSimple: (objectMemory byteSwapped32IfBigEndian: (objectMemory fetchLong32: 0 ofObject: oop)) to: #'unsigned int'. - magnitude := self cppIf: VMBIGENDIAN - ifTrue: - [(objectMemory fetchLong32: 0 ofObject: oop) asUnsignedInteger byteSwap32] - ifFalse: - [(objectMemory fetchLong32: 0 ofObject: oop) asUnsignedInteger]. (negative ifTrue: [magnitude > 16r80000000] ifFalse: [magnitude >= 16r80000000]) ifTrue: [self primitiveFail. ^0]. negative ifTrue: [value := 0 - magnitude] ifFalse: [value := magnitude]. ^value! Item was changed: ----- Method: InterpreterPrimitives>>signed64BitValueOf: (in category 'primitive support') ----- signed64BitValueOf: oop "Convert the given object into an integer value. The object may be either a positive SmallInteger or a eight-byte LargeInteger." | sz value negative ok magnitude | <inline: false> <returnTypeC: #sqLong> <var: #value type: #sqLong> <var: #magnitude type: #usqLong> (objectMemory isIntegerObject: oop) ifTrue: [^self cCoerce: (objectMemory integerValueOf: oop) to: #sqLong]. (objectMemory isNonIntegerImmediate: oop) ifTrue: [self primitiveFail. ^0]. ok := objectMemory isClassOfNonImm: oop equalTo: (objectMemory splObj: ClassLargePositiveInteger) compactClassIndex: ClassLargePositiveIntegerCompactIndex. ok ifTrue: [negative := false] ifFalse: [negative := true. ok := objectMemory isClassOfNonImm: oop equalTo: (objectMemory splObj: ClassLargeNegativeInteger) compactClassIndex: ClassLargeNegativeIntegerCompactIndex. ok ifFalse: [self primitiveFail. ^0]]. sz := objectMemory numBytesOfBytes: oop. sz > (self sizeof: #sqLong) ifTrue: [self primitiveFail. ^0]. + "self cppIf: SPURVM - self cppIf: VMBIGENDIAN ifTrue: + [""Memory is 8 byte aligned in Spur and oversized bytes are set to zero, so we can safely fetch 8 bytes"" + magnitude := objectMemory byteSwapped64IfBigEndian: (objectMemory fetchLong64: 0 ofObject: oop)] - [magnitude := sz > 4 - ifTrue: [(objectMemory fetchLong64: 0 ofObject: oop) byteSwap64] - ifFalse: [(self cCoerceSimple: (objectMemory fetchLong32: 0 ofObject: oop) to: #'unsigned int') byteSwap32]] ifFalse: + ["sz > 4 + ifTrue: [magnitude := objectMemory byteSwapped64IfBigEndian: (objectMemory fetchLong64: 0 ofObject: oop)] + ifFalse: [magnitude := self cCoerceSimple: (objectMemory byteSwapped32IfBigEndian: (objectMemory fetchLong32: 0 ofObject: oop)) to: #'unsigned int']"]". - [magnitude := sz > 4 - ifTrue: [objectMemory fetchLong64: 0 ofObject: oop] - ifFalse: [self cCoerceSimple: (objectMemory fetchLong32: 0 ofObject: oop) to: #'unsigned int']]. (negative ifTrue: [magnitude > 16r8000000000000000] ifFalse: [magnitude >= 16r8000000000000000]) ifTrue: [self primitiveFail. ^0]. negative ifTrue: [value := 0 - magnitude] ifFalse: [value := magnitude]. ^value! Item was changed: ----- Method: InterpreterPrimitives>>signedMachineIntegerValueOf: (in category 'primitive support') ----- signedMachineIntegerValueOf: oop "Answer a signed value of an integer up to the size of a machine word. The object may be either a positive SmallInteger or a LargeInteger of size <= word size." <returnTypeC: #'long'> | negative ok bs value limit magnitude | <var: #value type: #long> <var: #magnitude type: #usqInt> <var: #limit type: #usqInt> (objectMemory isIntegerObject: oop) ifTrue: [^objectMemory integerValueOf: oop]. (objectMemory isNonIntegerImmediate: oop) ifTrue: [^self primitiveFail]. ok := objectMemory isClassOfNonImm: oop equalTo: (objectMemory splObj: ClassLargePositiveInteger) compactClassIndex: ClassLargePositiveIntegerCompactIndex. ok ifTrue: [negative := false] ifFalse: [negative := true. ok := objectMemory isClassOfNonImm: oop equalTo: (objectMemory splObj: ClassLargeNegativeInteger) compactClassIndex: ClassLargeNegativeIntegerCompactIndex. ok ifFalse: [^self primitiveFail]]. bs := objectMemory numBytesOf: oop. bs > (self sizeof: #'unsigned long') ifTrue: [^self primitiveFail]. + "self cppIf: SPURVM + ifTrue: + [""Memory is 8 byte aligned in Spur and oversized bytes are set to zero, so we can safely fetch 8 bytes"" + magnitude := objectMemory byteSwapped64IfBigEndian: (objectMemory fetchLong64: 0 ofObject: oop)] - ((self sizeof: #'unsigned long') = 8 - and: [bs > 4]) ifTrue: - [magnitude := self cppIf: VMBIGENDIAN - ifTrue: - [(objectMemory fetchLong64: 0 ofObject: oop) byteSwap64] - ifFalse: - [objectMemory fetchLong64: 0 ofObject: oop]] ifFalse: + ["((self sizeof: #'unsigned long') = 8 + and: [bs > 4]) + ifTrue: + [magnitude := objectMemory byteSwapped64IfBigEndian: (objectMemory fetchLong64: 0 ofObject: oop)] + ifFalse: + [magnitude := self cCoerceSimple: (objectMemory byteSwapped32IfBigEndian: (objectMemory fetchLong32: 0 ofObject: oop)) to: #'unsigned int']"]". - [magnitude := self cppIf: VMBIGENDIAN - ifTrue: - [(objectMemory fetchLong32: 0 ofObject: oop) asUnsignedInteger byteSwap32] - ifFalse: - [(objectMemory fetchLong32: 0 ofObject: oop) asUnsignedInteger]]. limit := 1 asUnsignedInteger << ((self sizeof: #usqInt) * 8 - 1). (negative ifTrue: [magnitude > limit] ifFalse: [magnitude >= limit]) ifTrue: [self primitiveFail. ^0]. negative ifTrue: [value := 0 - magnitude] ifFalse: [value := magnitude]. ^value! Item was added: + ----- Method: InterpreterSimulatorLSB>>byteSwapped32IfBigEndian: (in category 'memory access') ----- + byteSwapped32IfBigEndian: w + "Accelerate, we now we are not big endian" + ^w bitAnd: 16rFFFFFFFF! Item was added: + ----- Method: InterpreterSimulatorLSB>>byteSwapped64IfBigEndian: (in category 'memory access') ----- + byteSwapped64IfBigEndian: w + "Accelerate, we now we are not big endian" + ^w bitAnd: 16rFFFFFFFFFFFFFFFF! Item was added: + ----- Method: InterpreterSimulatorMSB>>byteSwapped32IfBigEndian: (in category 'memory access') ----- + byteSwapped32IfBigEndian: w + "Accelerate, we now we are big endian" + ^w byteSwap32! Item was added: + ----- Method: InterpreterSimulatorMSB>>byteSwapped64IfBigEndian: (in category 'memory access') ----- + byteSwapped64IfBigEndian: w + "Accelerate, we now we are big endian" + ^w byteSwap64! Item was added: + ----- Method: NewCoObjectMemorySimulatorLSB>>byteSwapped32IfBigEndian: (in category 'memory access') ----- + byteSwapped32IfBigEndian: w + "Accelerate, we now we are not big endian" + ^w bitAnd: 16rFFFFFFFF! Item was added: + ----- Method: NewCoObjectMemorySimulatorLSB>>byteSwapped64IfBigEndian: (in category 'memory access') ----- + byteSwapped64IfBigEndian: w + "Accelerate, we now we are not big endian" + ^w bitAnd: 16rFFFFFFFFFFFFFFFF! Item was added: + ----- Method: NewCoObjectMemorySimulatorMSB>>byteSwapped32IfBigEndian: (in category 'memory access') ----- + byteSwapped32IfBigEndian: w + "Accelerate, we now we are big endian" + ^w byteSwap32! Item was added: + ----- Method: NewCoObjectMemorySimulatorMSB>>byteSwapped64IfBigEndian: (in category 'memory access') ----- + byteSwapped64IfBigEndian: w + "Accelerate, we now we are big endian" + ^w byteSwap64! Item was added: + ----- Method: NewObjectMemorySimulatorLSB>>byteSwapped32IfBigEndian: (in category 'memory access') ----- + byteSwapped32IfBigEndian: w + "Accelerate, we now we are not big endian" + ^w bitAnd: 16rFFFFFFFF! Item was added: + ----- Method: NewObjectMemorySimulatorLSB>>byteSwapped64IfBigEndian: (in category 'memory access') ----- + byteSwapped64IfBigEndian: w + "Accelerate, we now we are not big endian" + ^w bitAnd: 16rFFFFFFFFFFFFFFFF! Item was added: + ----- Method: NewObjectMemorySimulatorMSB>>byteSwapped32IfBigEndian: (in category 'memory access') ----- + byteSwapped32IfBigEndian: w + "Accelerate, we now we are big endian" + ^w byteSwap32! Item was added: + ----- Method: NewObjectMemorySimulatorMSB>>byteSwapped64IfBigEndian: (in category 'memory access') ----- + byteSwapped64IfBigEndian: w + "Accelerate, we now we are big endian" + ^w byteSwap64! Item was added: + ----- Method: ObjectMemory>>byteSwapped32IfBigEndian: (in category 'memory access') ----- + byteSwapped32IfBigEndian: w + "If the VM is big endian, then swap the bytes of w" + <api> + <var: 'w' type: #'unsigned int'> + <returnTypeC: #'unsigned int'> + self cppIf: VMBIGENDIAN + ifTrue: [^w byteSwap32] + ifFalse: [^w bitAnd: 16rFFFFFFFF]! Item was added: + ----- Method: ObjectMemory>>byteSwapped64IfBigEndian: (in category 'memory access') ----- + byteSwapped64IfBigEndian: w + "If the VM is big endian, then swap the bytes of w" + <api> + <var: 'w' type: #'unsigned long long'> + <returnTypeC: #'unsigned long long'> + self cppIf: VMBIGENDIAN + ifTrue: [^w byteSwap64] + ifFalse: [^w bitAnd: 16rFFFFFFFFFFFFFFFF]! Item was changed: ----- Method: StackInterpreter>>maybeInlinePositive32BitIntegerFor: (in category 'primitive support') ----- maybeInlinePositive32BitIntegerFor: integerValue "N.B. will *not* cause a GC. integerValue is interpreted as POSITIVE, e.g. as the result of Bitmap>at:." <notOption: #Spur64BitMemoryManager> <var: 'integerValue' type: #'unsigned int'> | newLargeInteger | self deny: objectMemory hasSixtyFourBitImmediates. "force coercion because slang inliner sometimes incorrectly pass a signed int without converting to unsigned" (self cCode: [self cCoerceSimple: integerValue to: #'unsigned int'] inSmalltalk: [integerValue bitAnd: 1 << 32 - 1]) <= objectMemory maxSmallInteger ifTrue: [^objectMemory integerObjectOf: integerValue]. newLargeInteger := objectMemory eeInstantiateSmallClassIndex: ClassLargePositiveIntegerCompactIndex format: (objectMemory byteFormatForNumBytes: 4) numSlots: 1. + self cppIf: SPURVM - self cppIf: VMBIGENDIAN ifTrue: + ["Memory is 8 byte aligned in Spur, make sure that oversized bytes are set to zero" + objectMemory storeLong32: 0 ofObject: newLargeInteger withValue: (objectMemory byteSwapped32IfBigEndian: integerValue). + objectMemory storeLong32: 1 ofObject: newLargeInteger withValue: 0] + ifFalse: + [objectMemory storeLong32: 0 ofObject: newLargeInteger withValue: (objectMemory byteSwapped32IfBigEndian: integerValue)]. - [objectMemory storeLong32: 0 ofObject: newLargeInteger withValue: integerValue byteSwap32] - ifFalse: - [objectMemory storeLong32: 0 ofObject: newLargeInteger withValue: integerValue]. ^newLargeInteger! Item was changed: ----- Method: StackInterpreter>>noInlineSigned32BitIntegerFor: (in category 'primitive support') ----- noInlineSigned32BitIntegerFor: integerValue "Answer a full 32 bit integer object for the given integer value." <notOption: #Spur64BitMemoryManager> | newLargeInteger value largeClass | <inline: false> (objectMemory isIntegerValue: integerValue) ifTrue: [^objectMemory integerObjectOf: integerValue]. self deny: objectMemory hasSixtyFourBitImmediates. integerValue < 0 ifTrue: [largeClass := ClassLargeNegativeIntegerCompactIndex. value := 0 - integerValue] ifFalse: [largeClass := ClassLargePositiveIntegerCompactIndex. value := integerValue]. newLargeInteger := objectMemory eeInstantiateSmallClassIndex: largeClass format: (objectMemory byteFormatForNumBytes: 4) numSlots: 1. + self cppIf: SPURVM - self cppIf: VMBIGENDIAN ifTrue: + ["Memory is 8 byte aligned in Spur, make sure that oversized bytes are set to zero" + objectMemory storeLong32: 0 ofObject: newLargeInteger withValue: (objectMemory byteSwapped32IfBigEndian: integerValue). + objectMemory storeLong32: 1 ofObject: newLargeInteger withValue: 0] + ifFalse: + [objectMemory storeLong32: 0 ofObject: newLargeInteger withValue: (objectMemory byteSwapped32IfBigEndian: value)]. - [objectMemory storeLong32: 0 ofObject: newLargeInteger withValue: value byteSwap32] - ifFalse: - [objectMemory storeLong32: 0 ofObject: newLargeInteger withValue: value]. ^newLargeInteger! Item was changed: ----- Method: StackInterpreter>>positive64BitIntegerFor: (in category 'primitive support') ----- positive64BitIntegerFor: integerValue <api> <var: 'integerValue' type: #usqLong> <var: 'highWord' type: #'unsigned int'> "Answer a Large Positive Integer object for the given integer value. N.B. will *not* cause a GC." | newLargeInteger highWord sz | objectMemory hasSixtyFourBitImmediates ifTrue: [(self cCode: [integerValue] inSmalltalk: [integerValue bitAnd: 1 << 64 - 1]) <= objectMemory maxSmallInteger ifTrue: [^objectMemory integerObjectOf: integerValue]. sz := 8] ifFalse: [(highWord := integerValue >> 32) = 0 ifTrue: [^self positive32BitIntegerFor: integerValue]. sz := 5. (highWord := highWord >> 8) = 0 ifFalse: [sz := sz + 1. (highWord := highWord >> 8) = 0 ifFalse: [sz := sz + 1. (highWord := highWord >> 8) = 0 ifFalse:[sz := sz + 1]]]]. newLargeInteger := objectMemory eeInstantiateSmallClassIndex: ClassLargePositiveIntegerCompactIndex format: (objectMemory byteFormatForNumBytes: sz) numSlots: 8 / objectMemory bytesPerOop. + objectMemory storeLong64: 0 ofObject: newLargeInteger withValue: (objectMemory byteSwapped64IfBigEndian: integerValue). - self cppIf: VMBIGENDIAN - ifTrue: - [objectMemory storeLong64: 0 ofObject: newLargeInteger withValue: integerValue byteSwap64] - ifFalse: - [objectMemory storeLong64: 0 ofObject: newLargeInteger withValue: integerValue]. ^newLargeInteger ! Item was changed: ----- Method: StackInterpreter>>signed64BitIntegerFor: (in category 'primitive support') ----- signed64BitIntegerFor: integerValue <var: 'integerValue' type: #sqLong> "Answer a Large Integer object for the given integer value. N.B. will *not* cause a GC." | newLargeInteger magnitude largeClass highWord sz | <inline: false> <var: 'magnitude' type: #usqLong> <var: 'highWord' type: #usqInt> integerValue < 0 ifTrue:[ integerValue >= objectMemory minSmallInteger ifTrue: [^objectMemory integerObjectOf: integerValue asInteger]. largeClass := ClassLargeNegativeIntegerCompactIndex. magnitude := 0 - (self cCoerceSimple: integerValue to: #usqLong)] ifFalse:[ integerValue <= objectMemory maxSmallInteger ifTrue: [^objectMemory integerObjectOf: integerValue asInteger]. largeClass := ClassLargePositiveIntegerCompactIndex. magnitude := integerValue]. objectMemory wordSize = 8 ifTrue: [sz := 8] ifFalse: [ (highWord := magnitude >> 32) = 0 ifTrue: [sz := 4] ifFalse: [sz := 5. (highWord := highWord >> 8) = 0 ifFalse: [sz := sz + 1. (highWord := highWord >> 8) = 0 ifFalse: [sz := sz + 1. (highWord := highWord >> 8) = 0 ifFalse: [sz := sz + 1]]]]]. newLargeInteger := objectMemory eeInstantiateSmallClassIndex: largeClass format: (objectMemory byteFormatForNumBytes: sz) numSlots: sz + 3 // objectMemory bytesPerOop. + self cppIf: SPURVM - self cppIf: VMBIGENDIAN ifTrue: + ["Memory is eight byte aligned in SPUR, so we are sure to have room for 64bits word whatever allocated sz" + objectMemory storeLong64: 0 ofObject: newLargeInteger withValue: (objectMemory byteSwapped64IfBigEndian: magnitude)] - [sz > 4 - ifTrue: [objectMemory storeLong64: 0 ofObject: newLargeInteger withValue: magnitude byteSwap64] - ifFalse: [objectMemory storeLong32: 0 ofObject: newLargeInteger withValue: magnitude byteSwap32]] ifFalse: [sz > 4 + ifTrue: [objectMemory storeLong64: 0 ofObject: newLargeInteger withValue: (objectMemory byteSwapped64IfBigEndian: magnitude)] + ifFalse: [objectMemory storeLong32: 0 ofObject: newLargeInteger withValue: (objectMemory byteSwapped32IfBigEndian: magnitude)]]. - ifTrue: [objectMemory storeLong64: 0 ofObject: newLargeInteger withValue: magnitude] - ifFalse: [objectMemory storeLong32: 0 ofObject: newLargeInteger withValue: (self cCode: [magnitude] inSmalltalk: [magnitude bitAnd: 16rFFFFFFFF])]]. ^newLargeInteger!

1 0

VM Maker: BytecodeSets.spur-cb.42.mcz
by commits＠source.squeak.org 05 Apr '16

05 Apr '16

Eliot Miranda uploaded a new version of BytecodeSets to project VM Maker: http://source.squeak.org/VMMaker/BytecodeSets.spur-cb.42.mcz ==================== Summary ==================== Name: BytecodeSets.spur-cb.42 Author: cb Time: 5 April 2016, 9:41:24.032 am UUID: 4e97953a-3686-49d6-b427-09163314bec6 Ancestors: BytecodeSets.spur-cb.41 added notAContext flag =============== Diff against BytecodeSets.spur-cb.41 =============== Item was removed: - ----- Method: EncoderForSistaV1>>genNoStoreCheckFlag (in category 'extended bytecode generation') ----- - genNoStoreCheckFlag - self genUnsignedSingleExtendB: 1! Item was added: + ----- Method: EncoderForSistaV1>>genStackFlagExtensionIgnoreStoreCheck:notAContext: (in category 'extended bytecode generation') ----- + genStackFlagExtensionIgnoreStoreCheck: ignoreStoreCheck notAContext: notAContext + "Can be applied to the long form of store and store pop of literal variable, remote inst var, remote temp, receiver inst var. + The notAContext bit can be used only with instance variable stores." + self genUnsignedSingleExtendB: ignoreStoreCheck asBit + (notAContext asBit << 1)!

1 0

VM Maker: VMMaker.oscog-cb.1762.mcz
by commits＠source.squeak.org 05 Apr '16

05 Apr '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-cb.1762.mcz ==================== Summary ==================== Name: VMMaker.oscog-cb.1762 Author: cb Time: 5 April 2016, 9:18:17.237 am UUID: 738d2e04-fc8f-47fc-a4c0-69cbc16bf688 Ancestors: VMMaker.oscog-cb.1761 started to add all the new sista bytecodes in the stack interpreter. I started with the remote inst var access, then figure out I hadn't think about the context inst var case. =============== Diff against VMMaker.oscog-cb.1761 =============== Item was changed: ----- Method: SimpleStackBasedCogit class>>initializeBytecodeTableForSistaV1 (in category 'class initialization') ----- initializeBytecodeTableForSistaV1 "SimpleStackBasedCogit initializeBytecodeTableForSistaV1" BytecodeSetHasDirectedSuperSend := true. FirstSpecialSelector := 96. NumSpecialSelectors := 32. self flag: 'Special selector send class must be inlined to agree with the interpreter, which inlines class. If class is sent to e.g. a general instance of ProtoObject then unless class is inlined there will be an MNU. It must be that the Cointerpreter and Cogit have identical semantics. We get away with not hardwiring the other special selectors either because in the Cointerpreter they are not inlined or because they are inlined only to instances of classes for which there will always be a method.'. self generatorTableFrom: #( "1 byte bytecodes" "pushes" (1 0 15 genPushReceiverVariableBytecode isInstVarRef) (1 16 31 genPushLiteralVariable16CasesBytecode needsFrameNever: 1) (1 32 63 genPushLiteralConstantBytecode needsFrameNever: 1) (1 64 75 genPushTemporaryVariableBytecode) (1 76 76 genPushReceiverBytecode) (1 77 77 genPushConstantTrueBytecode needsFrameNever: 1) (1 78 78 genPushConstantFalseBytecode needsFrameNever: 1) (1 79 79 genPushConstantNilBytecode needsFrameNever: 1) (1 80 80 genPushConstantZeroBytecode needsFrameNever: 1) (1 81 81 genPushConstantOneBytecode needsFrameNever: 1) (1 82 82 genExtPushPseudoVariable) (1 83 83 duplicateTopBytecode needsFrameNever: 1) (1 84 87 unknownBytecode) "returns" (1 88 88 genReturnReceiver return needsFrameIfInBlock: isMappedInBlock 0) (1 89 89 genReturnTrue return needsFrameIfInBlock: isMappedInBlock 0) (1 90 90 genReturnFalse return needsFrameIfInBlock: isMappedInBlock 0) (1 91 91 genReturnNil return needsFrameIfInBlock: isMappedInBlock 0) (1 92 92 genReturnTopFromMethod return needsFrameIfInBlock: isMappedInBlock -1) (1 93 93 genReturnNilFromBlock return needsFrameNever: -1) (1 94 94 genReturnTopFromBlock return needsFrameNever: -1) (1 95 95 genExtNopBytecode needsFrameNever: 0) "sends" (1 96 117 genSpecialSelectorSend isMapped) "#+ #- #< #> #<= #>= #= #~= #* #/ #\\ #@ #bitShift: #// #bitAnd: #bitOr: #at: #at:put: #size #next #nextPut: #atEnd" (1 118 118 genSpecialSelectorEqualsEquals needsFrameNever: notMapped -1) "not mapped because it is directly inlined (for now)" (1 119 119 genSpecialSelectorClass needsFrameNever: notMapped 0) "not mapped because it is directly inlined (for now)" (1 120 127 genSpecialSelectorSend isMapped) "#blockCopy: #value #value: #do: #new #new: #x #y" (1 128 143 genSendLiteralSelector0ArgsBytecode isMapped) (1 144 159 genSendLiteralSelector1ArgBytecode isMapped) (1 160 175 genSendLiteralSelector2ArgsBytecode isMapped) "jumps" (1 176 183 genShortUnconditionalJump branch v3:ShortForward:Branch:Distance:) (1 184 191 genShortJumpIfTrue branch isBranchTrue isMapped "because of mustBeBoolean" v3:ShortForward:Branch:Distance:) (1 192 199 genShortJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v3:ShortForward:Branch:Distance:) "stores" (1 200 207 genStoreAndPopReceiverVariableBytecode isInstVarRef isMappedIfImmutability needsFrameIfImmutability: -1) (1 208 215 genStoreAndPopTemporaryVariableBytecode) (1 216 216 genPopStackBytecode needsFrameNever: -1) (1 217 217 genUnconditionalTrapBytecode isMapped) (1 218 223 unknownBytecode) "2 byte bytecodes" (2 224 224 extABytecode extension) (2 225 225 extBBytecode extension) "pushes" (2 226 226 genExtPushReceiverVariableBytecode isInstVarRef) "Needs a frame for context inst var access" (2 227 227 genExtPushLiteralVariableBytecode needsFrameNever: 1) (2 228 228 genExtPushLiteralBytecode needsFrameNever: 1) (2 229 229 genLongPushTemporaryVariableBytecode) (2 230 230 genPushClosureTempsBytecode) (2 231 231 genPushNewArrayBytecode) (2 232 232 genExtPushIntegerBytecode needsFrameNever: 1) (2 233 233 genExtPushCharacterBytecode needsFrameNever: 1) "returns" "sends" (2 234 234 genExtSendBytecode isMapped) (2 235 235 genExtSendSuperBytecode isMapped) "sista bytecodes" (2 236 236 unknownBytecode) "jumps" (2 237 237 genExtUnconditionalJump branch isMapped "because of interrupt check" v4:Long:Branch:Distance:) (2 238 238 genExtJumpIfTrue branch isBranchTrue isMapped "because of mustBeBoolean" v4:Long:Branch:Distance:) (2 239 239 genExtJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v4:Long:Branch:Distance:) "stores" (2 240 240 genExtStoreAndPopReceiverVariableBytecode isInstVarRef isMappedIfImmutability) (2 241 241 genExtStoreAndPopLiteralVariableBytecode isMappedIfImmutability) (2 242 242 genLongStoreAndPopTemporaryVariableBytecode) (2 243 243 genExtStoreReceiverVariableBytecode isInstVarRef isMappedIfImmutability) (2 244 244 genExtStoreLiteralVariableBytecode isMappedIfImmutability) (2 245 245 genLongStoreTemporaryVariableBytecode) (2 246 247 unknownBytecode) "3 byte bytecodes" (3 248 248 genCallPrimitiveBytecode) (3 249 249 unknownBytecode) "reserved for Push Float" (3 250 250 genExtPushClosureBytecode block v4:Block:Code:Size:) + (3 251 251 genExtPushRemoteTempOrRemoteInstVarLongBytecode) + (3 252 252 genExtStoreRemoteTempOrRemoteInstVarLongBytecode) + (3 253 253 genExtStoreAndPopRemoteTempOrRemoteInstVarLongBytecode) - (3 251 251 genPushRemoteTempOrRemoteInstVarLongBytecode) - (3 252 252 genStoreRemoteTempOrRemoteInstVarLongBytecode) - (3 253 253 genStoreAndPopRemoteTempOrRemoteInstVarLongBytecode) (3 254 254 genExtJumpIfNotInstanceOfBehaviorsOrPopBytecode) (3 255 255 unknownBytecode))! Item was added: + ----- Method: SimpleStackBasedCogit>>genExtPushRemoteTempOrRemoteInstVarLongBytecode (in category 'bytecode generators') ----- + genExtPushRemoteTempOrRemoteInstVarLongBytecode + ^ (byte2 noMask: 1 << 7) + ifTrue: [ self genPushRemoteTempLongBytecode ] + ifFalse: [ self genExtPushRemoteInstVarLongBytecode ]! Item was added: + ----- Method: SimpleStackBasedCogit>>genExtStoreAndPopRemoteTempOrRemoteInstVarLongBytecode (in category 'bytecode generators') ----- + genExtStoreAndPopRemoteTempOrRemoteInstVarLongBytecode + | index | + index := byte1 + (extA << 8). + extA := 0. + ^ (byte2 noMask: 1 << 7) + ifTrue: [ self genStorePop: true RemoteTemp: byte1 At: byte2 ] + ifFalse: [ self genStorePop: true RemoteInstVar: index At: byte2 - (1 << 7) ]! Item was added: + ----- Method: SimpleStackBasedCogit>>genExtStoreRemoteTempOrRemoteInstVarLongBytecode (in category 'bytecode generators') ----- + genExtStoreRemoteTempOrRemoteInstVarLongBytecode + | index | + index := byte1 + (extA << 8). + extA := 0. + ^ (byte2 noMask: 1 << 7) + ifTrue: [ self genStorePop: false RemoteTemp: byte1 At: byte2 ] + ifFalse: [ self genStorePop: false RemoteInstVar: index At: byte2 - (1 << 7) ]! Item was changed: ----- Method: SimpleStackBasedCogit>>genPushRemoteInstVarLongBytecode (in category 'bytecode generators') ----- genPushRemoteInstVarLongBytecode + | index | + index := byte1 + (extA << 8). + extA := 0. self MoveMw: (self frameOffsetOfTemporary: byte2 - (1 << 7)) r: FPReg R: ClassReg. objectRepresentation genEnsureOopInRegNotForwarded: ClassReg scratchReg: TempReg. objectRepresentation + genLoadSlot: index - genLoadSlot: byte1 sourceReg: ClassReg destReg: TempReg. self PushR: TempReg. ^0! Item was changed: ----- Method: SimpleStackBasedCogit>>genPushRemoteTempLongBytecode (in category 'bytecode generators') ----- genPushRemoteTempLongBytecode + extA := 0. self MoveMw: (self frameOffsetOfTemporary: byte2) r: FPReg R: ClassReg. objectRepresentation genLoadSlot: byte1 sourceReg: ClassReg destReg: TempReg. self PushR: TempReg. ^0! Item was removed: - ----- Method: SimpleStackBasedCogit>>genStoreAndPopRemoteTempOrRemoteInstVarLongBytecode (in category 'bytecode generators') ----- - genStoreAndPopRemoteTempOrRemoteInstVarLongBytecode - ^ (byte2 noMask: 1 << 7) - ifTrue: [ self genStorePop: true RemoteTemp: byte1 At: byte2 ] - ifFalse: [ self genStorePop: true RemoteInstVar: byte1 At: byte2 - (1 << 7) ]! Item was removed: - ----- Method: SimpleStackBasedCogit>>genStoreRemoteTempOrRemoteInstVarLongBytecode (in category 'bytecode generators') ----- - genStoreRemoteTempOrRemoteInstVarLongBytecode - ^ (byte2 noMask: 1 << 7) - ifTrue: [ self genStorePop: false RemoteTemp: byte1 At: byte2 ] - ifFalse: [ self genStorePop: false RemoteInstVar: byte1 At: byte2 - (1 << 7) ]! Item was changed: ----- Method: StackInterpreter class>>initializeBytecodeTableForSistaV1 (in category 'initialization') ----- initializeBytecodeTableForSistaV1 "See e.g. the cass comment for EncoderForSistaV1" "StackInterpreter initializeBytecodeTableForSistaV1" "Note: This table will be used to generate a C switch statement." BytecodeTable := Array new: 256. BytecodeEncoderClassName := #EncoderForSistaV1. BytecodeSetHasDirectedSuperSend := true. self table: BytecodeTable from: #( "1 byte bytecodes" ( 0 15 pushReceiverVariableBytecode) ( 16 31 pushLiteralVariable16CasesBytecode) ( 32 63 pushLiteralConstantBytecode) ( 64 75 pushTemporaryVariableBytecode) ( 76 pushReceiverBytecode) ( 77 pushConstantTrueBytecode) ( 78 pushConstantFalseBytecode) ( 79 pushConstantNilBytecode) ( 80 pushConstantZeroBytecode) ( 81 pushConstantOneBytecode) ( 82 extPushPseudoVariable) ( 83 duplicateTopBytecode) ( 84 87 unknownBytecode) ( 88 returnReceiver) ( 89 returnTrue) ( 90 returnFalse) ( 91 returnNil) ( 92 returnTopFromMethod) ( 93 returnNilFromBlock) ( 94 returnTopFromBlock) ( 95 extNopBytecode) ( 96 bytecodePrimAdd) ( 97 bytecodePrimSubtract) ( 98 bytecodePrimLessThanSistaV1) "for booleanCheatSistaV1:" ( 99 bytecodePrimGreaterThanSistaV1) "for booleanCheatSistaV1:" (100 bytecodePrimLessOrEqualSistaV1) "for booleanCheatSistaV1:" (101 bytecodePrimGreaterOrEqualSistaV1) "for booleanCheatSistaV1:" (102 bytecodePrimEqualSistaV1) "for booleanCheatSistaV1:" (103 bytecodePrimNotEqualSistaV1) "for booleanCheatSistaV1:" (104 bytecodePrimMultiply) (105 bytecodePrimDivide) (106 bytecodePrimMod) (107 bytecodePrimMakePoint) (108 bytecodePrimBitShift) (109 bytecodePrimDiv) (110 bytecodePrimBitAnd) (111 bytecodePrimBitOr) (112 bytecodePrimAt) (113 bytecodePrimAtPut) (114 bytecodePrimSize) (115 bytecodePrimNext) "i.e. a 0 arg special selector" (116 bytecodePrimNextPut) "i.e. a 1 arg special selector" (117 bytecodePrimAtEnd) (118 bytecodePrimIdenticalSistaV1) "for booleanCheatSistaV1:" (119 bytecodePrimClass) (120 bytecodePrimSpecialSelector24) "was blockCopy:" (121 bytecodePrimValue) (122 bytecodePrimValueWithArg) (123 bytecodePrimDo) "i.e. a 1 arg special selector" (124 bytecodePrimNew) "i.e. a 0 arg special selector" (125 bytecodePrimNewWithArg) "i.e. a 1 arg special selector" (126 bytecodePrimPointX) "i.e. a 0 arg special selector" (127 bytecodePrimPointY) "i.e. a 0 arg special selector" (128 143 sendLiteralSelector0ArgsBytecode) (144 159 sendLiteralSelector1ArgBytecode) (160 175 sendLiteralSelector2ArgsBytecode) (176 183 shortUnconditionalJump) (184 191 shortConditionalJumpTrue) (192 199 shortConditionalJumpFalse) (200 207 storeAndPopReceiverVariableBytecode) (208 215 storeAndPopTemporaryVariableBytecode) (216 popStackBytecode) (217 unconditionnalTrapBytecode) (218 223 unknownBytecode) "2 byte bytecodes" (224 extABytecode) (225 extBBytecode) (226 extPushReceiverVariableBytecode) (227 extPushLiteralVariableBytecode) (228 extPushLiteralBytecode) (229 longPushTemporaryVariableBytecode) (230 pushClosureTempsBytecode) (231 pushNewArrayBytecode) (232 extPushIntegerBytecode) (233 extPushCharacterBytecode) (234 extSendBytecode) (235 extSendSuperBytecode) (236 unknownBytecode) (237 extUnconditionalJump) (238 extJumpIfTrue) (239 extJumpIfFalse) (240 extStoreAndPopReceiverVariableBytecode) (241 extStoreAndPopLiteralVariableBytecode) (242 longStoreAndPopTemporaryVariableBytecode) (243 extStoreReceiverVariableBytecode) (244 extStoreLiteralVariableBytecode) (245 longStoreTemporaryVariableBytecode) (246 247 unknownBytecode) "3 byte bytecodes" (248 callPrimitiveBytecode) (249 unknownBytecode) "reserved for Push Float" (250 extPushClosureBytecode) + (251 extPushRemoteTempOrRemoteInstVarLongBytecode) + (252 extStoreRemoteTempOrRemoteInstVarLongBytecode) + (253 extStoreAndPopRemoteTempOrRemoteInstVarLongBytecode) - (251 pushRemoteTempLongBytecode) - (252 storeRemoteTempLongBytecode) - (253 storeAndPopRemoteTempLongBytecode) (254 extJumpIfNotInstanceOfBehaviorsOrPopBytecode) (255 unknownBytecode) )! Item was added: + ----- Method: StackInterpreter>>extPushRemoteInstVar:inObjectAt: (in category 'stack bytecodes') ----- + extPushRemoteInstVar: byte1 inObjectAt: objectIndex + | instVarIndex object | + instVarIndex := byte1 + (extA << 8). + extA := 0. + object := self temporary: objectIndex in: localFP. + (objectMemory isForwarded: object) ifTrue: + [object := objectMemory followForwarded: object]. + self internalPush: (objectMemory fetchPointer: instVarIndex ofObject: object).! Item was added: + ----- Method: StackInterpreter>>extPushRemoteTempOrRemoteInstVarLongBytecode (in category 'stack bytecodes') ----- + extPushRemoteTempOrRemoteInstVarLongBytecode + | byte1 byte2 | + byte1 := self fetchByte. + byte2 := self fetchByte. + self fetchNextBytecode. + (byte2 noMask: 1 << 7) + ifTrue: + [ self pushRemoteTemp: byte1 inVectorAt: byte2 ] + ifFalse: + [ self extPushRemoteInstVar: byte1 inObjectAt: byte2 - (1 << 7) ] + ! Item was added: + ----- Method: StackInterpreter>>extStoreAndPopRemoteTempOrRemoteInstVarLongBytecode (in category 'stack bytecodes') ----- + extStoreAndPopRemoteTempOrRemoteInstVarLongBytecode + | byte1 byte2 | + byte1 := self fetchByte. + byte2 := self fetchByte. + self fetchNextBytecode. + (byte2 noMask: 1 << 7) + ifTrue: + [ self storeRemoteTemp: byte1 inVectorAt: byte2. + self internalPop: 1 ] + ifFalse: + [ self extStoreRemoteInstVar: byte1 inObjectAt: byte2 - (1 << 7). + self internalPop: 1 ] + ! Item was added: + ----- Method: StackInterpreter>>extStoreRemoteInstVar:inObjectAt: (in category 'stack bytecodes') ----- + extStoreRemoteInstVar: byte1 inObjectAt: objectIndex + | instVarIndex object | + instVarIndex := byte1 + (extA << 8). + extA := 0. + object := self temporary: objectIndex in: localFP. + (objectMemory isForwarded: object) ifTrue: + [object := objectMemory followForwarded: object]. + objectMemory storePointerImmutabilityCheck: instVarIndex ofObject: object withValue: self internalStackTop! Item was added: + ----- Method: StackInterpreter>>extStoreRemoteTempOrRemoteInstVarLongBytecode (in category 'stack bytecodes') ----- + extStoreRemoteTempOrRemoteInstVarLongBytecode + | byte1 byte2 | + byte1 := self fetchByte. + byte2 := self fetchByte. + self fetchNextBytecode. + (byte2 noMask: 1 << 7) + ifTrue: + [ self storeRemoteTemp: byte1 inVectorAt: byte2 ] + ifFalse: + [ self extStoreRemoteInstVar: byte1 inObjectAt: byte2 - (1 << 7) ] + ! Item was changed: ----- Method: StackToRegisterMappingCogit class>>initializeBytecodeTableForSistaV1 (in category 'class initialization') ----- initializeBytecodeTableForSistaV1 "StackToRegisterMappingCogit initializeBytecodeTableForSistaV1" numPushNilsFunction := #sistaV1:Num:Push:Nils:. pushNilSizeFunction := #sistaV1PushNilSize:numInitialNils:. BytecodeSetHasDirectedSuperSend := true. FirstSpecialSelector := 96. NumSpecialSelectors := 32. self flag: 'Special selector send class must be inlined to agree with the interpreter, which inlines class. If class is sent to e.g. a general instance of ProtoObject then unless class is inlined there will be an MNU. It must be that the Cointerpreter and Cogit have identical semantics. We get away with not hardwiring the other special selectors either because in the Cointerpreter they are not inlined or because they are inlined only to instances of classes for which there will always be a method.'. self generatorTableFrom: #( "1 byte bytecodes" "pushes" (1 0 15 genPushReceiverVariableBytecode isInstVarRef needsFrameNever: 1) (1 16 31 genPushLitVarDirSup16CasesBytecode needsFrameNever: 1) (1 32 63 genPushLiteralConstantBytecode needsFrameNever: 1) (1 64 75 genPushTemporaryVariableBytecode needsFrameIfMod16GENumArgs: 1) (1 76 76 genPushReceiverBytecode needsFrameNever: 1) (1 77 77 genPushConstantTrueBytecode needsFrameNever: 1) (1 78 78 genPushConstantFalseBytecode needsFrameNever: 1) (1 79 79 genPushConstantNilBytecode needsFrameNever: 1) (1 80 80 genPushConstantZeroBytecode needsFrameNever: 1) (1 81 81 genPushConstantOneBytecode needsFrameNever: 1) (1 82 82 genExtPushPseudoVariable) (1 83 83 duplicateTopBytecode needsFrameNever: 1) (1 84 87 unknownBytecode) "returns" (1 88 88 genReturnReceiver return needsFrameIfInBlock: isMappedInBlock 0) (1 89 89 genReturnTrue return needsFrameIfInBlock: isMappedInBlock 0) (1 90 90 genReturnFalse return needsFrameIfInBlock: isMappedInBlock 0) (1 91 91 genReturnNil return needsFrameIfInBlock: isMappedInBlock 0) (1 92 92 genReturnTopFromMethod return needsFrameIfInBlock: isMappedInBlock -1) (1 93 93 genReturnNilFromBlock return needsFrameNever: -1) (1 94 94 genReturnTopFromBlock return needsFrameNever: -1) (1 95 95 genExtNopBytecode needsFrameNever: 0) "sends" (1 96 96 genSpecialSelectorArithmetic isMapped AddRR) (1 97 97 genSpecialSelectorArithmetic isMapped SubRR) (1 98 98 genSpecialSelectorComparison isMapped JumpLess) (1 99 99 genSpecialSelectorComparison isMapped JumpGreater) (1 100 100 genSpecialSelectorComparison isMapped JumpLessOrEqual) (1 101 101 genSpecialSelectorComparison isMapped JumpGreaterOrEqual) (1 102 102 genSpecialSelectorComparison isMapped JumpZero) (1 103 103 genSpecialSelectorComparison isMapped JumpNonZero) (1 104 109 genSpecialSelectorSend isMapped) " #* #/ #\\ #@ #bitShift: //" (1 110 110 genSpecialSelectorArithmetic isMapped AndRR) (1 111 111 genSpecialSelectorArithmetic isMapped OrRR) (1 112 117 genSpecialSelectorSend isMapped) "#at: #at:put: #size #next #nextPut: #atEnd" (1 118 118 genSpecialSelectorEqualsEquals needsFrameNever: notMapped -1) "not mapped because it is directly inlined (for now)" (1 119 119 genSpecialSelectorClass needsFrameIfStackGreaterThanOne: notMapped 0) "not mapped because it is directly inlined (for now)" (1 120 127 genSpecialSelectorSend isMapped) "#blockCopy: #value #value: #do: #new #new: #x #y" (1 128 143 genSendLiteralSelector0ArgsBytecode isMapped) (1 144 159 genSendLiteralSelector1ArgBytecode isMapped) (1 160 175 genSendLiteralSelector2ArgsBytecode isMapped) "jumps" (1 176 183 genShortUnconditionalJump branch v3:ShortForward:Branch:Distance:) (1 184 191 genShortJumpIfTrue branch isBranchTrue isMapped "because of mustBeBoolean" v3:ShortForward:Branch:Distance:) (1 192 199 genShortJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v3:ShortForward:Branch:Distance:) (1 200 207 genStoreAndPopReceiverVariableBytecode isInstVarRef isMappedIfImmutability needsFrameIfImmutability: -1) (1 208 215 genStoreAndPopTemporaryVariableBytecode) (1 216 216 genPopStackBytecode needsFrameNever: -1) (1 217 217 genUnconditionalTrapBytecode isMapped) (1 218 223 unknownBytecode) "2 byte bytecodes" (2 224 224 extABytecode extension) (2 225 225 extBBytecode extension) "pushes" (2 226 226 genExtPushReceiverVariableBytecode isInstVarRef) "Needs a frame for context inst var access" (2 227 227 genExtPushLitVarDirSupBytecode needsFrameNever: 1) (2 228 228 genExtPushLiteralBytecode needsFrameNever: 1) (2 229 229 genLongPushTemporaryVariableBytecode) (2 230 230 genPushClosureTempsBytecode) (2 231 231 genPushNewArrayBytecode) (2 232 232 genExtPushIntegerBytecode needsFrameNever: 1) (2 233 233 genExtPushCharacterBytecode needsFrameNever: 1) "returns" "sends" (2 234 234 genExtSendBytecode isMapped) (2 235 235 genExtSendSuperBytecode isMapped) "sista bytecodes" (2 236 236 unknownBytecode) "jumps" (2 237 237 genExtUnconditionalJump branch isMapped "because of interrupt check" v4:Long:Branch:Distance:) (2 238 238 genExtJumpIfTrue branch isBranchTrue isMapped "because of mustBeBoolean" v4:Long:Branch:Distance:) (2 239 239 genExtJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v4:Long:Branch:Distance:) "stores" (2 240 240 genExtStoreAndPopReceiverVariableBytecode isInstVarRef isMappedIfImmutability) (2 241 241 genExtStoreAndPopLiteralVariableBytecode isMappedIfImmutability) (2 242 242 genLongStoreAndPopTemporaryVariableBytecode) (2 243 243 genExtStoreReceiverVariableBytecode isInstVarRef isMappedIfImmutability) (2 244 244 genExtStoreLiteralVariableBytecode isMappedIfImmutability) (2 245 245 genLongStoreTemporaryVariableBytecode) (2 246 247 unknownBytecode) "3 byte bytecodes" (3 248 248 genCallPrimitiveBytecode) (3 249 249 unknownBytecode) "reserved for Push Float" (3 250 250 genExtPushClosureBytecode block v4:Block:Code:Size:) + (3 251 251 genExtPushRemoteTempOrRemoteInstVarLongBytecode) + (3 252 252 genExtStoreRemoteTempOrRemoteInstVarLongBytecode) + (3 253 253 genExtStoreAndPopRemoteTempOrRemoteInstVarLongBytecode) - (3 251 251 genPushRemoteTempOrRemoteInstVarLongBytecode) - (3 252 252 genStoreRemoteTempOrRemoteInstVarLongBytecode) - (3 253 253 genStoreAndPopRemoteTempOrRemoteInstVarLongBytecode) (3 254 254 genExtJumpIfNotInstanceOfBehaviorsOrPopBytecode branch v4:Long:BranchIfNotInstanceOf:Distance:) (3 255 255 unknownBytecode))! Item was changed: ----- Method: StackToRegisterMappingCogit>>genJumpIf:to: (in category 'bytecode generator support') ----- genJumpIf: boolean to: targetBytecodePC <inline: false> | desc fixup ok | <var: #desc type: #'CogSimStackEntry *'> <var: #fixup type: #'BytecodeFixup *'> <var: #ok type: #'AbstractInstruction *'> self ssFlushTo: simStackPtr - 1. desc := self ssTop. self ssPop: 1. (desc type == SSConstant and: [desc constant = objectMemory trueObject or: [desc constant = objectMemory falseObject]]) ifTrue: ["Must arrange there's a fixup at the target whether it is jumped to or not so that the simStackPtr can be kept correct." fixup := self ensureFixupAt: targetBytecodePC - initialPC. "Must enter any annotatedConstants into the map" desc annotateUse ifTrue: [self annotateBytecode: (self prevInstIsPCAnnotated ifTrue: [self Nop] ifFalse: [self Label])]. "Must annotate the bytecode for correct pc mapping." self annotateBytecode: (desc constant = boolean ifTrue: [self Jump: fixup] ifFalse: [self prevInstIsPCAnnotated ifTrue: [self Nop] ifFalse: [self Label]]). ^0]. desc popToReg: TempReg. "Cunning trick by LPD. If true and false are contiguous subtract the smaller. Correct result is either 0 or the distance between them. If result is not 0 or their distance send mustBeBoolean." self assert: (objectMemory objectAfter: objectMemory falseObject) = objectMemory trueObject. self annotate: (self SubCw: boolean R: TempReg) objRef: boolean. self JumpZero: (self ensureFixupAt: targetBytecodePC - initialPC). + (extA anyMask: 1) ifTrue: [ extA := 0. ^ 0 ]. + self assert: extA = 0. - extA = 1 ifTrue: [ extA := 0. ^ 0 ]. - extA := 0. self CmpCq: (boolean == objectMemory falseObject ifTrue: [objectMemory trueObject - objectMemory falseObject] ifFalse: [objectMemory falseObject - objectMemory trueObject]) R: TempReg. ok := self JumpZero: 0. self CallRT: (boolean == objectMemory falseObject ifTrue: [ceSendMustBeBooleanAddFalseTrampoline] ifFalse: [ceSendMustBeBooleanAddTrueTrampoline]). ok jmpTarget: (self annotateBytecode: self Label). ^0!

1 0

VM Maker: VMMaker.oscog-cb.1761.mcz
by commits＠source.squeak.org 05 Apr '16

05 Apr '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-cb.1761.mcz ==================== Summary ==================== Name: VMMaker.oscog-cb.1761 Author: cb Time: 5 April 2016, 8:30:22.911 am UUID: 9c2db655-156a-4a19-ad6b-562101255631 Ancestors: VMMaker.oscog-cb.1760 correctly reset the extension state in many places. =============== Diff against VMMaker.oscog-cb.1760 =============== Item was changed: ----- Method: SimpleStackBasedCogit>>genJumpIf:to: (in category 'bytecode generator support') ----- genJumpIf: boolean to: targetBytecodePC <inline: false> "Cunning trick by LPD. If true and false are contiguous subtract the smaller. Correct result is either 0 or the distance between them. If result is not 0 or their distance send mustBeBoolean." | ok | <var: #ok type: #'AbstractInstruction *'> self assert: (objectMemory objectAfter: objectMemory falseObject) = objectMemory trueObject. self PopR: TempReg. self annotate: (self SubCw: boolean R: TempReg) objRef: boolean. self JumpZero: (self ensureFixupAt: targetBytecodePC - initialPC). self CmpCq: (boolean == objectMemory falseObject ifTrue: [objectMemory trueObject - objectMemory falseObject] ifFalse: [objectMemory falseObject - objectMemory trueObject]) R: TempReg. ok := self JumpZero: 0. self CallRT: (boolean == objectMemory falseObject ifTrue: [ceSendMustBeBooleanAddFalseTrampoline] ifFalse: [ceSendMustBeBooleanAddTrueTrampoline]). ok jmpTarget: (self annotateBytecode: self Label). + extA := 0. "ignores the flag" ^0! Item was changed: ----- Method: SimpleStackBasedCogit>>genStorePop:LiteralVariable: (in category 'bytecode generator support') ----- genStorePop: popBoolean LiteralVariable: litVarIndex <inline: false> | association | "The only reason we assert needsFrame here is that in a frameless method ReceiverResultReg must and does contain only self, but the ceStoreCheck trampoline expects the target of the store to be in ReceiverResultReg. So in a frameless method we would have a conflict between the receiver and the literal store, unless we we smart enough to realise that ReceiverResultReg was unused after the literal variable store, unlikely given that methods return self by default." + extB := 0. "do the store check anyway" self assert: needsFrame. association := self getLiteral: litVarIndex. self genMoveConstant: association R: ReceiverResultReg. objectRepresentation genEnsureObjInRegNotForwarded: ReceiverResultReg scratchReg: TempReg. popBoolean ifTrue: [self PopR: ClassReg] ifFalse: [self MoveMw: 0 r: SPReg R: ClassReg]. self genStoreSourceReg: ClassReg slotIndex: ValueIndex destReg: ReceiverResultReg scratchReg: TempReg inFrame: needsFrame. ^0! Item was changed: ----- Method: SimpleStackBasedCogit>>genStorePop:MaybeContextReceiverVariable: (in category 'bytecode generator support') ----- genStorePop: popBoolean MaybeContextReceiverVariable: slotIndex <inline: false> | jmpSingle jmpDone | <var: #jmpSingle type: #'AbstractInstruction *'> <var: #jmpDone type: #'AbstractInstruction *'> "The reason we need a frame here is that assigning to an inst var of a context may involve wholesale reorganization of stack pages, and the only way to preserve the execution state of an activation in that case is if it has a frame." + extB := 0. "do the store check anyway" self assert: needsFrame. self putSelfInReceiverResultReg. objectRepresentation genLoadSlot: SenderIndex sourceReg: ReceiverResultReg destReg: TempReg. self MoveMw: 0 r: SPReg R: ClassReg. jmpSingle := objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg. self MoveCq: slotIndex R: SendNumArgsReg. self CallRT: ceStoreContextInstVarTrampoline. jmpDone := self Jump: 0. jmpSingle jmpTarget: self Label. popBoolean ifTrue: [self AddCq: objectMemory wordSize R: SPReg]. self genStoreSourceReg: ClassReg slotIndex: slotIndex destReg: ReceiverResultReg scratchReg: TempReg inFrame: needsFrame. jmpDone jmpTarget: self Label. ^0! Item was changed: ----- Method: SimpleStackBasedCogit>>genStorePop:ReceiverVariable: (in category 'bytecode generator support') ----- genStorePop: popBoolean ReceiverVariable: slotIndex <inline: false> + extB := 0. "do the store check anyway" needsFrame ifTrue: [self putSelfInReceiverResultReg]. popBoolean ifTrue: [self PopR: ClassReg] ifFalse: [self MoveMw: 0 r: SPReg R: ClassReg]. self genStoreSourceReg: ClassReg slotIndex: slotIndex destReg: ReceiverResultReg scratchReg: TempReg inFrame: needsFrame. ^0! Item was changed: ----- Method: SimpleStackBasedCogit>>genStorePop:RemoteInstVar:At: (in category 'bytecode generator support') ----- genStorePop: popBoolean RemoteInstVar: slotIndex At: objectIndex <inline: false> "The only reason we assert needsFrame here is that in a frameless method ReceiverResultReg must and does contain only self, but the ceStoreCheck trampoline expects the target of the store to be in ReceiverResultReg. So in a frameless method we would have a conflict between the receiver and the temote temp store, unless we we smart enough to realise that ReceiverResultReg was unused after the literal variable store, unlikely given that methods return self by default." + extB := 0. "do the store check anyway" self assert: needsFrame. popBoolean ifTrue: [self PopR: ClassReg] ifFalse: [self MoveMw: 0 r: SPReg R: ClassReg]. self MoveMw: (self frameOffsetOfTemporary: objectIndex) r: FPReg R: ReceiverResultReg. objectRepresentation genEnsureOopInRegNotForwarded: ReceiverResultReg scratchReg: TempReg. ^objectRepresentation genStoreSourceReg: ClassReg slotIndex: slotIndex destReg: ReceiverResultReg scratchReg: TempReg inFrame: needsFrame! Item was changed: ----- Method: SimpleStackBasedCogit>>genStorePop:RemoteTemp:At: (in category 'bytecode generator support') ----- genStorePop: popBoolean RemoteTemp: slotIndex At: remoteTempIndex <inline: false> "The only reason we assert needsFrame here is that in a frameless method ReceiverResultReg must and does contain only self, but the ceStoreCheck trampoline expects the target of the store to be in ReceiverResultReg. So in a frameless method we would have a conflict between the receiver and the temote temp store, unless we we smart enough to realise that ReceiverResultReg was unused after the literal variable store, unlikely given that methods return self by default." + extB := 0. "do the store check anyway" self assert: needsFrame. popBoolean ifTrue: [self PopR: ClassReg] ifFalse: [self MoveMw: 0 r: SPReg R: ClassReg]. self MoveMw: (self frameOffsetOfTemporary: remoteTempIndex) r: FPReg R: ReceiverResultReg. ^objectRepresentation genStoreSourceReg: ClassReg slotIndex: slotIndex destReg: ReceiverResultReg scratchReg: TempReg inFrame: needsFrame! Item was changed: ----- Method: SistaStackToRegisterMappingCogit>>genCounterTripOnlyJumpIf:to: (in category 'bytecode generator support') ----- genCounterTripOnlyJumpIf: boolean to: targetBytecodePC "Specific version if the branch is only reached while falling through if the counter trips after an inlined #== branch. We do not regenerate the counter logic in this case to avoid 24 bytes instructions." <var: #ok type: #'AbstractInstruction *'> <var: #mustBeBooleanTrampoline type: #'AbstractInstruction *'> | ok mustBeBooleanTrampoline | + extA := 0. "reset it, we don't care if MBB not needed as we need the trampoline anyway" + self ssFlushTo: simStackPtr - 1. self ssTop popToReg: TempReg. self ssPop: 1. counterIndex := counterIndex + 1. "counters are increased / decreased in the inlined branch" "We need SendNumArgsReg because of the mustBeBooleanTrampoline" self ssAllocateRequiredReg: SendNumArgsReg. self MoveCq: 1 R: SendNumArgsReg. "The first time this is reached, it calls necessarily the counter trip for the trampoline because SendNumArgsReg is non zero" mustBeBooleanTrampoline := self CallRT: (boolean == objectMemory falseObject ifTrue: [ceSendMustBeBooleanAddFalseTrampoline] ifFalse: [ceSendMustBeBooleanAddTrueTrampoline]). self annotateBytecode: self Label. "Cunning trick by LPD. If true and false are contiguous subtract the smaller. Correct result is either 0 or the distance between them. If result is not 0 or their distance send mustBeBoolean." self assert: (objectMemory objectAfter: objectMemory falseObject) = objectMemory trueObject. self annotate: (self SubCw: boolean R: TempReg) objRef: boolean. self JumpZero: (self ensureFixupAt: targetBytecodePC - initialPC). self CmpCq: (boolean == objectMemory falseObject ifTrue: [objectMemory trueObject - objectMemory falseObject] ifFalse: [objectMemory falseObject - objectMemory trueObject]) R: TempReg. ok := self JumpZero: 0. self MoveCq: 0 R: SendNumArgsReg. "if counterReg is 0 this is a mustBeBoolean, not a counter trip." self Jump: mustBeBooleanTrampoline. ok jmpTarget: self Label. ^0!

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 April 2016