Vm-dev April 2016

vm-dev@lists.squeakfoundation.org

35 participants
202 discussions

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

06 Apr '16

ClementBera uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-cb.1770.mcz ==================== Summary ==================== Name: VMMaker.oscog-cb.1770 Author: cb Time: 5 April 2016, 6:28:46.687 pm UUID: 0c623bff-4d52-436e-8ce8-20e48a36f265 Ancestors: VMMaker.oscog-cb.1769 block creation side of full block closure scheme. =============== Diff against VMMaker.oscog-cb.1769 =============== Item was added: + ----- Method: CoInterpreter>>pushFullClosureNumArgs:copiedValues:compiledBlock:receiverIsOnStack: (in category 'stack bytecodes') ----- + pushFullClosureNumArgs: numArgs copiedValues: numCopiedArg compiledBlock: compiledBlock receiverIsOnStack: receiverIsOnStack + "The compiler has pushed the values to be copied, if any. The receiver has been pushed on stack before if specified. + Create a Closure with space for the copiedValues and pop numCopied values off the stack into the closure. + Sets outerContext, compiledBlock, numArgs and receiver as specified.." + <inline: true> + | numCopied newClosure context startIndex | + "No need to record the pushed copied values in the outerContext." + context := self ensureFrameIsMarried: localFP SP: localSP + (numCopiedArg * objectMemory bytesPerOop). + newClosure := self + fullClosureIn: context + numArgs: numArgs + numCopiedValues: numCopiedArg + compiledBlock: compiledBlock. + cogit recordSendTrace ifTrue: + [self recordTrace: TraceBlockCreation thing: newClosure source: TraceIsFromInterpreter]. + receiverIsOnStack + ifFalse: + [ startIndex := FullClosureFirstCopiedValueIndex. + objectMemory storePointerUnchecked: FullClosureReceiverIndex + ofObject: newClosure + withValue: self receiver. + numCopied := numCopiedArg ] + ifTrue: + [ startIndex := FullClosureReceiverIndex. + numCopied := numCopiedArg + 1 ]. + numCopied > 0 ifTrue: + [0 to: numCopied - 1 do: + [ :i | + "Assume: have just allocated a new BlockClosure; it must be young. + Thus, can use unchecked stores." + objectMemory storePointerUnchecked: i + startIndex + ofObject: newClosure + withValue: (self internalStackValue: numCopied - i - 1)]. + self internalPop: numCopied]. + self fetchNextBytecode. + self internalPush: newClosure! Item was changed: ----- Method: CoInterpreter>>startPCOrNilOfLiteral:in: (in category 'cog jit support') ----- startPCOrNilOfLiteral: lit in: aMethodObj "Answer the startPC of lit if it is a (clean) block in aMethodObj, otherwise answer nil." <api> | outerContext | ((objectMemory isNonImmediate: lit) and: [(objectMemory formatOf: lit) = objectMemory indexablePointersFormat + and: [(objectMemory numSlotsOf: lit) >= ClosureFirstCopiedValueIndex]]) ifFalse: - and: [(objectMemory numSlotsOf: lit) >= ClosureCopiedValuesIndex]]) ifFalse: [^nil]. outerContext := objectMemory fetchPointer: ClosureOuterContextIndex ofObject: lit. (objectMemory isContext: outerContext) ifFalse: [^nil]. aMethodObj ~~ (objectMemory fetchPointer: MethodIndex ofObject: outerContext) ifTrue: [^nil]. ^self quickFetchInteger: ClosureStartPCIndex ofObject: lit! Item was changed: ----- Method: ObjectMemory class>>initializeSpecialObjectIndices (in category 'initialization') ----- initializeSpecialObjectIndices "Initialize indices into specialObjects array." NilObject := 0. FalseObject := 1. TrueObject := 2. SchedulerAssociation := 3. ClassBitmap := 4. ClassSmallInteger := 5. ClassByteString := ClassString := 6. "N.B. Actually class ByteString" ClassArray := 7. "SmalltalkDictionary := 8." "Do not delete!!" ClassFloat := 9. ClassMethodContext := 10. ClassBlockContext := 11. ClassPoint := 12. ClassLargePositiveInteger := 13. TheDisplay := 14. ClassMessage := 15. "ClassCompiledMethod := 16. unused by the VM" TheLowSpaceSemaphore := 17. ClassSemaphore := 18. ClassCharacter := 19. SelectorDoesNotUnderstand := 20. SelectorCannotReturn := 21. ProcessSignalingLowSpace := 22. "was TheInputSemaphore" SpecialSelectors := 23. CharacterTable := 24. SelectorMustBeBoolean := 25. ClassByteArray := 26. "ClassProcess := 27. unused" CompactClasses := 28. TheTimerSemaphore := 29. TheInterruptSemaphore := 30. SelectorCannotInterpret := 34. "Was MethodContextProto := 35." ClassBlockClosure := 36. + ClassFullBlockClosure := 37. "Was BlockContextProto := 37." - "Was BlockContextProto := 37." ExternalObjectsArray := 38. ClassMutex := 39. "Was: ClassTranslatedMethod := 40." ProcessInExternalCodeTag := 40. TheFinalizationSemaphore := 41. ClassLargeNegativeInteger := 42. ClassExternalAddress := 43. ClassExternalStructure := 44. ClassExternalData := 45. ClassExternalFunction := 46. ClassExternalLibrary := 47. SelectorAboutToReturn := 48. SelectorRunWithIn := 49. SelectorAttemptToAssign := 50. "PrimErrTableIndex := 51. in VMClass class>>initializePrimitiveErrorCodes" ClassAlien := 52. SelectorInvokeCallback := 53. ClassUnsafeAlien := 54. ClassWeakFinalizer := 55. ForeignCallbackProcess := 56. SelectorUnknownBytecode := 57. SelectorCounterTripped := 58. SelectorSistaTrap := 59 ! Item was changed: ----- Method: SpurMemoryManager class>>initializeCompactClassIndices (in category 'class initialization') ----- initializeCompactClassIndices "Reuse the compact class indices to name known classIndices. This helps reduce the churn in the interpreters." "c.f. SpurBootstrap>>defineKnownClassIndices" FirstValidClassIndex := ClassLargeNegativeIntegerCompactIndex := 32. ClassLargePositiveIntegerCompactIndex := 33. ClassFloatCompactIndex := 34. ClassMessageCompactIndex := 35. ClassMethodContextCompactIndex := 36. ClassBlockContextCompactIndex := 0. ClassBlockClosureCompactIndex := 37. + ClassFullBlockClosureCompactIndex := 38. ClassByteArrayCompactIndex := 50. ClassArrayCompactIndex := 51. ClassByteStringCompactIndex := 52. ClassBitmapCompactIndex := 53! 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 extSistaStoreAndPopReceiverVariableBytecode) (241 extSistaStoreAndPopLiteralVariableBytecode) (242 longStoreAndPopTemporaryVariableBytecode) (243 extSistaStoreReceiverVariableBytecode) (244 extSistaStoreLiteralVariableBytecode) (245 longStoreTemporaryVariableBytecode) (246 247 unknownBytecode) "3 byte bytecodes" (248 callPrimitiveBytecode) (249 unknownBytecode) "reserved for Push Float" (250 extPushClosureBytecode) (251 extPushRemoteTempOrInstVarLongBytecode) (252 extStoreRemoteTempOrInstVarLongBytecode) (253 extStoreAndPopRemoteTempOrInstVarLongBytecode) (254 extJumpIfNotInstanceOfBehaviorsOrPopBytecode) + (255 extPushFullClosureBytecode) - (255 unknownBytecode) )! Item was changed: ----- Method: StackInterpreter class>>initializeContextIndices (in category 'initialization') ----- initializeContextIndices "Class MethodContext" SenderIndex := 0. InstructionPointerIndex := 1. StackPointerIndex := 2. MethodIndex := 3. ClosureIndex := 4. "N.B. Called receiverMap in old images, closureOrNil in newer images." ReceiverIndex := 5. CtxtTempFrameStart := 6. SmallContextSlots := CtxtTempFrameStart + 16. "16 indexable fields" "Large contexts have 56 indexable fields. Max with single header word of ObjectMemory [but not SpurMemoryManager ;-)]." LargeContextSlots := CtxtTempFrameStart + 56. "Including the header size in these sizes is problematic for multiple memory managers, so we don't use them. Set to #bogus for error checking." SmallContextSize := #bogus. LargeContextSize := #bogus. "Class BlockClosure" ClosureOuterContextIndex := 0. ClosureStartPCIndex := 1. ClosureNumArgsIndex := 2. ClosureFirstCopiedValueIndex := 3. + + "Class FullBlockClosure, outercontext and numArgs index are shared with the BlockClosure class." + FullClosureCompiledBlockIndex := 1. + FullClosureReceiverIndex := 3. + FullClosureFirstCopiedValueIndex := 4.! - ClosureCopiedValuesIndex := 3! Item was added: + ----- Method: StackInterpreter>>extPushFullClosureBytecode (in category 'stack bytecodes') ----- + extPushFullClosureBytecode + "255 11111111 xxxxxxxx siyyyyyy + push Closure Compiled block literal index xxxxxxxx (+ Extend A * 256) + numCopied yyyyyy + receiverOnStack: s = 1 + (i reserved for needsOuterContext: i = 1) + The compiler has pushed the values to be copied, if any. The receiver has been pushed on stack before if specified. + Create a Closure with space for the copiedValues and pop numCopied values off the stack into the closure. + Sets outerContext, compiledBlock, numArgs and receiver as specified.." + | compiledBlockLiteralIndex compiledBlock byte numArgs numCopied receiverIsOnStack | + compiledBlockLiteralIndex := self fetchByte + (extA << 8). + extA := 0. + compiledBlock := self literal: compiledBlockLiteralIndex. + self assert: (objectMemory isOopCompiledMethod: compiledBlock). + numArgs := self argumentCountOf: compiledBlock. + byte := self fetchByte. + numCopied := byte bitAnd: 1<< 6 - 1. + receiverIsOnStack := byte anyMask: 1 << 7. + self pushFullClosureNumArgs: numArgs copiedValues: numCopied compiledBlock: compiledBlock receiverIsOnStack: receiverIsOnStack! Item was added: + ----- Method: StackInterpreter>>fullClosureIn:numArgs:numCopiedValues:compiledBlock: (in category 'control primitives') ----- + fullClosureIn: context numArgs: numArgs numCopiedValues: numCopied compiledBlock: compiledBlock + | newClosure | + <inline: true> + self assert: ClassFullBlockClosureCompactIndex ~= 0. + ClassFullBlockClosureCompactIndex ~= 0 + ifTrue: + [newClosure := objectMemory + eeInstantiateSmallClassIndex: ClassFullBlockClosureCompactIndex + format: objectMemory indexablePointersFormat + numSlots: ClosureFirstCopiedValueIndex + numCopied] + ifFalse: + [newClosure := objectMemory + eeInstantiateSmallClass: (objectMemory splObj: ClassFullBlockClosure) + numSlots: FullClosureFirstCopiedValueIndex + numCopied]. + "Assume: have just allocated a new closure; it must be young. Thus, can use unchecked stores." + objectMemory + storePointerUnchecked: ClosureOuterContextIndex ofObject: newClosure withValue: context; + storePointerUnchecked: FullClosureCompiledBlockIndex ofObject: newClosure withValue: compiledBlock; + storePointerUnchecked: ClosureNumArgsIndex ofObject: newClosure withValue: (objectMemory integerObjectOf: numArgs). + ^newClosure! Item was changed: SharedPool subclass: #VMObjectIndices instanceVariableNames: '' + classVariableNames: 'ActiveProcessIndex CharacterTable CharacterValueIndex ClassAlien ClassArray ClassBitmap ClassBlockClosure ClassBlockContext ClassByteArray ClassByteString ClassCharacter ClassExternalAddress ClassExternalData ClassExternalFunction ClassExternalLibrary ClassExternalStructure ClassFloat ClassFullBlockClosure ClassLargeNegativeInteger ClassLargePositiveInteger ClassMessage ClassMethodContext ClassMutex ClassPoint ClassSemaphore ClassSmallInteger ClassString ClassUnsafeAlien ClassWeakFinalizer ClosureFirstCopiedValueIndex ClosureIndex ClosureNumArgsIndex ClosureOuterContextIndex ClosureStartPCIndex CompactClasses ConstMinusOne ConstOne ConstTwo ConstZero ExcessSignalsIndex ExternalObjectsArray FalseObject FirstLinkIndex ForeignCallbackProcess FullClosureCompiledBlockIndex FullClosureFirstCopiedValueIndex FullClosureReceiverIndex HeaderIndex InstanceSpecificationIndex InstructionPointerIndex KeyIndex LastLinkIndex LiteralStart MessageArgumentsIndex MessageLookupClassIndex MessageSelectorIndex MethodArrayIndex MethodDictionaryIndex MethodIndex MyListIndex NextLinkIndex NilObject PrimErrTableIndex PriorityIndex ProcessInExternalCodeTag ProcessListsIndex ProcessSignalingLowSpace ReceiverIndex SchedulerAssociation SelectorAboutToReturn SelectorAttemptToAssign SelectorCannotInterpret SelectorCannotReturn SelectorCounterTripped SelectorDoesNotUnderstand SelectorInvokeCallback SelectorMustBeBoolean SelectorRunWithIn SelectorSistaTrap SelectorStart SelectorUnknownBytecode SenderIndex SpecialSelectors StackPointerIndex StreamArrayIndex StreamIndexIndex StreamReadLimitIndex StreamWriteLimitIndex SuperclassIndex SuspendedContextIndex TheDisplay TheFinalizationSemaphore TheInputSemaphore TheInterruptSemaphore TheLowSpaceSemaphore TheTimerSemaphore TrueObject ValueIndex XIndex YIndex' - classVariableNames: 'ActiveProcessIndex CharacterTable CharacterValueIndex ClassAlien ClassArray ClassBitmap ClassBlockClosure ClassBlockContext ClassByteArray ClassByteString ClassCharacter ClassExternalAddress ClassExternalData ClassExternalFunction ClassExternalLibrary ClassExternalStructure ClassFloat ClassLargeNegativeInteger ClassLargePositiveInteger ClassMessage ClassMethodContext ClassMutex ClassPoint ClassSemaphore ClassSmallInteger ClassString ClassUnsafeAlien ClassWeakFinalizer ClosureCopiedValuesIndex ClosureFirstCopiedValueIndex ClosureIndex ClosureNumArgsIndex ClosureOuterContextIndex ClosureStartPCIndex CompactClasses ConstMinusOne ConstOne ConstTwo ConstZero ExcessSignalsIndex ExternalObjectsArray FalseObject FirstLinkIndex ForeignCallbackProcess HeaderIndex InstanceSpecificationIndex InstructionPointerIndex KeyIndex LastLinkIndex LiteralStart MessageArgumentsIndex MessageLookupClassIndex MessageSelectorIndex MethodArrayIndex MethodDictionaryIndex MethodIndex MyListIndex NextLinkIndex NilObject PrimErrTableIndex PriorityIndex ProcessInExternalCodeTag ProcessListsIndex ProcessSignalingLowSpace ReceiverIndex SchedulerAssociation SelectorAboutToReturn SelectorAttemptToAssign SelectorCannotInterpret SelectorCannotReturn SelectorCounterTripped SelectorDoesNotUnderstand SelectorInvokeCallback SelectorMustBeBoolean SelectorRunWithIn SelectorSistaTrap SelectorStart SelectorUnknownBytecode SenderIndex SpecialSelectors StackPointerIndex StreamArrayIndex StreamIndexIndex StreamReadLimitIndex StreamWriteLimitIndex SuperclassIndex SuspendedContextIndex TheDisplay TheFinalizationSemaphore TheInputSemaphore TheInterruptSemaphore TheLowSpaceSemaphore TheTimerSemaphore TrueObject ValueIndex XIndex YIndex' poolDictionaries: '' category: 'VMMaker-Interpreter'! !VMObjectIndices commentStamp: '<historical>' prior: 0! I am a shared pool for the constants that define object layout and well-known objects shared between the object memories (e.g. ObjectMemory, NewObjectMemory), the interpreters (e.g. StackInterpreter, CoInterpreter) and the object representations (e.g. ObjectRepresentationForSqueakV3). self classPool declare: #Foo from: StackInterpreter classPool (ObjectMemory classPool keys select: [:k| (k beginsWith: 'Class') and: [(k endsWith: 'Index') not]]) do: [:k| self classPool declare: k from: ObjectMemory classPool]! Item was changed: VMBasicConstants subclass: #VMSqueakClassIndices instanceVariableNames: '' + classVariableNames: 'ClassArrayCompactIndex ClassBitmapCompactIndex ClassBlockClosureCompactIndex ClassBlockContextCompactIndex ClassByteArrayCompactIndex ClassByteStringCompactIndex ClassFloatCompactIndex ClassFullBlockClosureCompactIndex ClassLargeNegativeIntegerCompactIndex ClassLargePositiveIntegerCompactIndex ClassMessageCompactIndex ClassMethodContextCompactIndex' - classVariableNames: 'ClassArrayCompactIndex ClassBitmapCompactIndex ClassBlockClosureCompactIndex ClassBlockContextCompactIndex ClassByteArrayCompactIndex ClassByteStringCompactIndex ClassFloatCompactIndex ClassLargeNegativeIntegerCompactIndex ClassLargePositiveIntegerCompactIndex ClassMessageCompactIndex ClassMethodContextCompactIndex' poolDictionaries: '' category: 'VMMaker-Interpreter'!

1 0

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

06 Apr '16

ClementBera uploaded a new version of BytecodeSets to project VM Maker: http://source.squeak.org/VMMaker/BytecodeSets.spur-cb.43.mcz ==================== Summary ==================== Name: BytecodeSets.spur-cb.43 Author: cb Time: 5 April 2016, 5:38:19.957 pm UUID: fc44c36f-2fa2-4dd5-8b8e-b85b8ad5857f Ancestors: BytecodeSets.spur-cb.42 fixed flag extension for stores. fixed comment =============== Diff against BytecodeSets.spur-cb.42 =============== Item was changed: BytecodeEncoder subclass: #EncoderForSistaV1 (excessive size, no diff calculated) Item was removed: - ----- 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)! Item was added: + ----- Method: EncoderForSistaV1>>genStoreFlagExtensionIgnoreStoreCheck:maybeContext: (in category 'extended bytecode generation') ----- + genStoreFlagExtensionIgnoreStoreCheck: ignoreStoreCheck maybeContext: maybeContext + "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 + (maybeContext asBit << 1)!

1 0

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

06 Apr '16

ClementBera uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-cb.1769.mcz ==================== Summary ==================== Name: VMMaker.oscog-cb.1769 Author: cb Time: 5 April 2016, 5:34:00.076 pm UUID: ff68a0fd-57fb-43a7-bfd9-9c72ab42b57d Ancestors: VMMaker.oscog-cb.1768 Added no must be boolean flag =============== Diff against VMMaker.oscog-cb.1768 =============== Item was changed: ----- Method: StackInterpreter>>extJumpIfFalse (in category 'jump bytecodes') ----- extJumpIfFalse "244 11110100 i i i i i i i i Pop and Jump 0n False i i i i i i i i (+ Extend B * 256, where Extend B >= 0)" | byte offset | byte := self fetchByte. offset := byte + (extB << 8). + extB := extA := 0. - extB := 0. self jumplfFalseBy: offset! Item was changed: ----- Method: StackInterpreter>>extJumpIfTrue (in category 'jump bytecodes') ----- extJumpIfTrue "243 11110011 i i i i i i i i Pop and Jump 0n True i i i i i i i i (+ Extend B * 256, where Extend B >= 0)" | byte offset | byte := self fetchByte. offset := byte + (extB << 8). + extB := extA := 0. - extB := 0. self jumplfTrueBy: offset!

1 0

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

06 Apr '16

ClementBera uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-cb.1768.mcz ==================== Summary ==================== Name: VMMaker.oscog-cb.1768 Author: cb Time: 5 April 2016, 5:30:34.345 pm UUID: 5027b1a4-9d8d-4358-91f7-d3de094ebd59 Ancestors: VMMaker.oscog-cb.1767 extract constant from JIT code. Added support in the interpreter for remote inst var access and access flags in other instructions. =============== Diff against VMMaker.oscog-cb.1767 =============== 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 extSistaStoreAndPopReceiverVariableBytecode) + (241 extSistaStoreAndPopLiteralVariableBytecode) - (240 extStoreAndPopReceiverVariableBytecode) - (241 extStoreAndPopLiteralVariableBytecode) (242 longStoreAndPopTemporaryVariableBytecode) + (243 extSistaStoreReceiverVariableBytecode) + (244 extSistaStoreLiteralVariableBytecode) - (243 extStoreReceiverVariableBytecode) - (244 extStoreLiteralVariableBytecode) (245 longStoreTemporaryVariableBytecode) (246 247 unknownBytecode) "3 byte bytecodes" (248 callPrimitiveBytecode) (249 unknownBytecode) "reserved for Push Float" (250 extPushClosureBytecode) + (251 extPushRemoteTempOrInstVarLongBytecode) + (252 extStoreRemoteTempOrInstVarLongBytecode) + (253 extStoreAndPopRemoteTempOrInstVarLongBytecode) - (251 pushRemoteTempLongBytecode) - (252 storeRemoteTempLongBytecode) - (253 storeAndPopRemoteTempLongBytecode) (254 extJumpIfNotInstanceOfBehaviorsOrPopBytecode) (255 unknownBytecode) )! Item was added: + ----- Method: StackInterpreter>>extPushRemoteTempOrInstVarLongBytecode (in category 'stack bytecodes') ----- + extPushRemoteTempOrInstVarLongBytecode + | slotIndex tempIndex object | + slotIndex := self fetchByte. + tempIndex := self fetchByte. + self fetchNextBytecode. + (tempIndex noMask: self remoteIsInstVarAccess) + ifTrue: [self pushRemoteTemp: slotIndex inVectorAt: tempIndex] + ifFalse: + [ slotIndex := slotIndex + (extA << 8). + extA := extB := 0. + object := self temporary: tempIndex in: localFP. + self pushMaybeContext: object receiverVariable: slotIndex ]! Item was added: + ----- Method: StackInterpreter>>extSistaStoreAndPopLiteralVariableBytecode (in category 'stack bytecodes') ----- + extSistaStoreAndPopLiteralVariableBytecode + "236 11101100 i i i i i i i i Pop and Store Literal Variable #iiiiiiii (+ Extend A * 256) + (3) ExtB lowest bit implies no store check is needed, ExtB next bit implies the object may be a context, other bits in the extension are unused." + | variableIndex value | + variableIndex := self fetchByte + (extA << 8). + value := self internalStackTop. + self internalPop: 1. + extA := extB := 0.. + self storeLiteralVariable: variableIndex withValue: value. + self fetchNextBytecode.! Item was added: + ----- Method: StackInterpreter>>extSistaStoreAndPopReceiverVariableBytecode (in category 'stack bytecodes') ----- + extSistaStoreAndPopReceiverVariableBytecode + "235 11101011 i i i i i i i i Pop and Store Receiver Variable #iiiiiii (+ Extend A * 256) + (3) ExtB lowest bit implies no store check is needed, ExtB next bit implies the object may be a context, other bits in the extension are unused." + | variableIndex value | + variableIndex := self fetchByte + (extA << 8). + extA := extB := 0. + value := self internalStackTop. + self internalPop: 1. + self storeMaybeContextReceiverVariable: variableIndex withValue: value. + self fetchNextBytecode.! Item was added: + ----- Method: StackInterpreter>>extSistaStoreLiteralVariableBytecode (in category 'stack bytecodes') ----- + extSistaStoreLiteralVariableBytecode + "233 11101001 i i i i i i i i Store Literal Variable #iiiiiiii (+ Extend A * 256) + (3) ExtB lowest bit implies no store check is needed, ExtB next bit implies the object may be a context, other bits in the extension are unused." + | variableIndex | + variableIndex := self fetchByte + (extA << 8). + extA := extB := 0. + self storeLiteralVariable: variableIndex withValue: self internalStackTop. + self fetchNextBytecode.! Item was added: + ----- Method: StackInterpreter>>extSistaStoreReceiverVariableBytecode (in category 'stack bytecodes') ----- + extSistaStoreReceiverVariableBytecode + "232 11101000 i i i i i i i i Store Receiver Variable #iiiiiii (+ Extend A * 256) + (3) ExtB lowest bit implies no store check is needed, ExtB next bit implies the object may be a context, other bits in the extension are unused." + | variableIndex | + variableIndex := self fetchByte + (extA << 8). + extA := extB := 0. + self storeMaybeContextReceiverVariable: variableIndex withValue: self internalStackTop. + self fetchNextBytecode.! Item was added: + ----- Method: StackInterpreter>>extStoreAndPopRemoteTempOrInstVarLongBytecode (in category 'stack bytecodes') ----- + extStoreAndPopRemoteTempOrInstVarLongBytecode + self extStoreRemoteTempOrInstVarLongBytecode. + self internalPop: 1! Item was added: + ----- Method: StackInterpreter>>extStoreRemoteTempOrInstVarLongBytecode (in category 'stack bytecodes') ----- + extStoreRemoteTempOrInstVarLongBytecode + | slotIndex tempIndex object | + slotIndex := self fetchByte. + tempIndex := self fetchByte. + self fetchNextBytecode. + (tempIndex noMask: self remoteIsInstVarAccess) + ifTrue: [self storeRemoteTemp: slotIndex inVectorAt: tempIndex] + ifFalse: + [ slotIndex := slotIndex + (extA << 8). + extA := extB := 0. + object := self temporary: tempIndex in: localFP. + self storeMaybeContext: object receiverVariable: slotIndex withValue: self internalStackTop ]! Item was added: + ----- Method: StackInterpreter>>pushMaybeContext:receiverVariable: (in category 'stack bytecodes') ----- + pushMaybeContext: obj receiverVariable: fieldIndex + "Must trap accesses to married and widowed contexts. + But don't want to check on all inst var accesses. This + method is only used by the long-form bytecodes, evading + the cost. Note that the method, closure and receiver fields + of married contexts are correctly initialized so they don't + need special treatment on read. Only sender, instruction + pointer and stack pointer need to be intercepted on reads." + <inline: true> + ((self isReadMediatedContextInstVarIndex: fieldIndex) + and: [objectMemory isContextNonImm: obj]) + ifTrue: + [self internalPush: (self instVar: fieldIndex ofContext: obj)] + ifFalse: + [self internalPush: (objectMemory fetchPointer: fieldIndex ofObject: obj)]! Item was changed: ----- Method: StackInterpreter>>pushMaybeContextReceiverVariable: (in category 'stack bytecodes') ----- pushMaybeContextReceiverVariable: fieldIndex "Must trap accesses to married and widowed contexts. But don't want to check on all inst var accesses. This method is only used by the long-form bytecodes, evading the cost. Note that the method, closure and receiver fields of married contexts are correctly initialized so they don't need special treatment on read. Only sender, instruction pointer and stack pointer need to be intercepted on reads." - | rcvr | <inline: true> + self pushMaybeContext: self receiver receiverVariable: fieldIndex! - rcvr := self receiver. - ((self isReadMediatedContextInstVarIndex: fieldIndex) - and: [objectMemory isContextNonImm: rcvr]) - ifTrue: - [self internalPush: (self instVar: fieldIndex ofContext: rcvr)] - ifFalse: - [self internalPush: (objectMemory fetchPointer: fieldIndex ofObject: rcvr)]! Item was added: + ----- Method: StackInterpreter>>remoteIsInstVarAccess (in category 'stack bytecodes') ----- + remoteIsInstVarAccess + "If this byte is set in the second byte (zero-based) of the instruction, + the remote temp instruction is in fact a remote inst var access" + <api> + <cmacro> + ^ 128 "1 << 7"! Item was added: + ----- Method: StackInterpreter>>storeMaybeContext:receiverVariable:withValue: (in category 'stack bytecodes') ----- + storeMaybeContext: obj receiverVariable: fieldIndex withValue: anObject + "Must trap accesses to married and widowed contexts. + But don't want to check on all inst var accesses. This + method is only used by the long-form bytecodes, evading the cost." + <inline: true> + ((self isWriteMediatedContextInstVarIndex: fieldIndex) + and: [(objectMemory isContextNonImm: obj) + and: [self isMarriedOrWidowedContext: obj]]) + ifTrue: + [self instVar: fieldIndex ofContext: obj put: anObject] + ifFalse: + [objectMemory storePointerImmutabilityCheck: fieldIndex ofObject: obj withValue: anObject] + ! Item was changed: ----- Method: StackInterpreter>>storeMaybeContextReceiverVariable:withValue: (in category 'stack bytecodes') ----- storeMaybeContextReceiverVariable: fieldIndex withValue: anObject "Must trap accesses to married and widowed contexts. But don't want to check on all inst var accesses. This method is only used by the long-form bytecodes, evading the cost." + self storeMaybeContext: self receiver receiverVariable: fieldIndex withValue: anObject - | rcvr | - rcvr := self receiver. - ((self isWriteMediatedContextInstVarIndex: fieldIndex) - and: [(objectMemory isContextNonImm: rcvr) - and: [self isMarriedOrWidowedContext: rcvr]]) - ifTrue: - [self instVar: fieldIndex ofContext: rcvr put: anObject] - ifFalse: - [objectMemory storePointerImmutabilityCheck: fieldIndex ofObject: rcvr withValue: anObject] ! Item was changed: ----- Method: StackToRegisterMappingCogit>>genExtPushRemoteTempOrInstVarLongBytecode (in category 'bytecode generators') ----- genExtPushRemoteTempOrInstVarLongBytecode | index maybeContext | + ^ (byte2 noMask: coInterpreter remoteIsInstVarAccess) - ^ (byte2 noMask: 1 << 7) ifTrue: [ self genPushRemoteTempLongBytecode ] ifFalse: [ maybeContext := self extBSpecifiesMaybeContext. index := byte1 + (extA << 8). extA := 0. extB := 0. ((coInterpreter isReadMediatedContextInstVarIndex: index) and: [ maybeContext ]) + ifTrue: [ self genPushMaybeContextRemoteInstVar: index inObjectAt: byte2 - coInterpreter remoteIsInstVarAccess ] + ifFalse: [ self genPushRemoteInstVar: index inObjectAt: byte2 - coInterpreter remoteIsInstVarAccess ] ]! - ifTrue: [ self genPushMaybeContextRemoteInstVar: index inObjectAt: byte2 - (1 << 7) ] - ifFalse: [ self genPushRemoteInstVar: index inObjectAt: byte2 - (1 << 7) ] ]! Item was changed: ----- Method: StackToRegisterMappingCogit>>genExtStorePopRemoteTempOrInstVarLongBytecode: (in category 'bytecode generators') ----- genExtStorePopRemoteTempOrInstVarLongBytecode: boolean | index maybeContext needsStoreCheck | needsStoreCheck := self sistaNeedsStoreCheck. maybeContext := self extBSpecifiesMaybeContext. extB := 0. + (byte2 noMask: coInterpreter remoteIsInstVarAccess) - (byte2 noMask: 1 << 7) ifTrue: [ self genStorePop: boolean RemoteTemp: byte1 At: byte2 needsStoreCheck: needsStoreCheck. self cppIf: IMMUTABILITY ifTrue: [ self annotateBytecode: self Label ] ] ifFalse: [ index := byte1 + (extA << 8). extA := 0. ((coInterpreter isWriteMediatedContextInstVarIndex: index) and: [ maybeContext ]) ifTrue: [ self genStorePop: boolean MaybeContextRemoteInstVar: index + ofObjectAt: byte2 - coInterpreter remoteIsInstVarAccess - ofObjectAt: byte2 - (1 << 7) needsStoreCheck: needsStoreCheck ] ifFalse: [ self genStorePop: boolean RemoteInstVar: index + ofObjectAt: byte2 - coInterpreter remoteIsInstVarAccess - ofObjectAt: byte2 - (1 << 7) needsStoreCheck: needsStoreCheck ] ]. ^ 0!

1 0

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

06 Apr '16

ClementBera uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-cb.1767.mcz ==================== Summary ==================== Name: VMMaker.oscog-cb.1767 Author: cb Time: 5 April 2016, 4:54:59.54 pm UUID: b8ef10ec-e7ee-458d-8b9c-47c0fb37d302 Ancestors: VMMaker.oscog-cb.1766 fixed a bug in and: or: generation in the SistaCogit. Check quickly that all extA are restored to 0. =============== Diff against VMMaker.oscog-cb.1766 =============== 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 *'> + extA := 0. 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). ^0! 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. + 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 nextPC nextDescriptor | <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 == objectMemory falseObject ifTrue: - 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. 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

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

06 Apr '16

ClementBera uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-cb.1766.mcz ==================== Summary ==================== Name: VMMaker.oscog-cb.1766 Author: cb Time: 5 April 2016, 4:48:20.054 pm UUID: 38f81b1b-b83b-42aa-9ed6-5f22efcd8db1 Ancestors: VMMaker.oscog-cb.1765 Added the no must be boolean flag to tell the JIt not to generate the mustbeboolean trampoline. =============== Diff against VMMaker.oscog-cb.1765 =============== Item was added: + ----- Method: StackToRegisterMappingCogit>>extASpecifiesNoMustBeBoolean (in category 'bytecode generator support') ----- + extASpecifiesNoMustBeBoolean + <inline: true> + ^ (extA anyMask: 1)! 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). + + self extASpecifiesNoMustBeBoolean ifTrue: + [ extA := 0. + self annotateBytecode: self lastOpcode. + ^ 0]. + extA := 0. + + . self CmpCq: (boolean == objectMemory falseObject - 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.1765.mcz
by commits＠source.squeak.org 06 Apr '16

06 Apr '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-cb.1765.mcz ==================== Summary ==================== Name: VMMaker.oscog-cb.1765 Author: cb Time: 5 April 2016, 4:34:19.354 pm UUID: 65ea22d4-d96c-41bb-b7d8-4ad1f021409b Ancestors: VMMaker.oscog-nice.1764 Added the remote inst var access bytecode in sista V1 bytecode without interfering with existing code. Added the ExtB flags extension to tip the JIT how what machine code checks can be ignored on specific operations. =============== Diff against VMMaker.oscog-nice.1764 =============== 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 genSistaExtStoreAndPopReceiverVariableBytecode isInstVarRef isMappedIfImmutability) + (2 241 241 genSistaExtStoreAndPopLiteralVariableBytecode isMappedIfImmutability) - (2 240 240 genExtStoreAndPopReceiverVariableBytecode isInstVarRef isMappedIfImmutability) - (2 241 241 genExtStoreAndPopLiteralVariableBytecode isMappedIfImmutability) (2 242 242 genLongStoreAndPopTemporaryVariableBytecode) + (2 243 243 genSistaExtStoreReceiverVariableBytecode isInstVarRef isMappedIfImmutability) + (2 244 244 genSistaExtStoreLiteralVariableBytecode isMappedIfImmutability) - (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 genExtPushRemoteTempOrInstVarLongBytecode) + (3 252 252 genExtStoreRemoteTempOrInstVarLongBytecode isMappedIfImmutability) + (3 253 253 genExtStoreAndPopRemoteTempOrInstVarLongBytecode isMappedIfImmutability) - (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>>genExtPushRemoteTempOrInstVarLongBytecode (in category 'bytecode generators') ----- + genExtPushRemoteTempOrInstVarLongBytecode + | index | + ^ (byte2 noMask: 1 << 7) + ifTrue: [ self genPushRemoteTempLongBytecode ] + ifFalse: + [ index := byte1 + (extA << 8). + extA := 0. + extB := 0. + (coInterpreter isReadMediatedContextInstVarIndex: index) + ifTrue: [ self genPushMaybeContextRemoteInstVar: index inObjectAt: byte2 - (1 << 7) ] + ifFalse: [ self genPushRemoteInstVar: index inObjectAt: byte2 - (1 << 7) ] ]! Item was added: + ----- Method: SimpleStackBasedCogit>>genExtStorePopRemoteTempOrInstVarLongBytecode (in category 'bytecode generators') ----- + genExtStorePopRemoteTempOrInstVarLongBytecode + ^ self genExtStorePopRemoteTempOrInstVarLongBytecode: true! Item was added: + ----- Method: SimpleStackBasedCogit>>genExtStorePopRemoteTempOrInstVarLongBytecode: (in category 'bytecode generators') ----- + genExtStorePopRemoteTempOrInstVarLongBytecode: boolean + | index | + extB := 0. "simple cogit don't use the extra flag" + (byte2 noMask: 1 << 7) + ifTrue: + [ self genStorePop: boolean RemoteTemp: byte1 At: byte2. + self cppIf: IMMUTABILITY ifTrue: [ self annotateBytecode: self Label ] ] + ifFalse: + [ index := byte1 + (extA << 8). + extA := 0. + (coInterpreter isWriteMediatedContextInstVarIndex: index) + ifTrue: [ self + genStorePop: boolean + MaybeContextRemoteInstVar: index + ofObjectAt: byte2 - (1 << 7) ] + ifFalse: [ self + genStorePop: boolean + RemoteInstVar: index + ofObjectAt: byte2 - (1 << 7) ] ]. + ^ 0! Item was added: + ----- Method: SimpleStackBasedCogit>>genExtStoreRemoteTempOrInstVarLongBytecode (in category 'bytecode generators') ----- + genExtStoreRemoteTempOrInstVarLongBytecode + ^ self genExtStorePopRemoteTempOrInstVarLongBytecode: false! Item was added: + ----- Method: SimpleStackBasedCogit>>genSistaExtStoreAndPopLiteralVariableBytecode (in category 'bytecode generators') ----- + genSistaExtStoreAndPopLiteralVariableBytecode + ^ self genSistaExtStoreLiteralVariableBytecode: true! Item was added: + ----- Method: SimpleStackBasedCogit>>genSistaExtStoreAndPopReceiverVariableBytecode (in category 'bytecode generators') ----- + genSistaExtStoreAndPopReceiverVariableBytecode + ^ self genSistaExtStoreAndPopReceiverVariableBytecode: true! Item was added: + ----- Method: SimpleStackBasedCogit>>genSistaExtStoreAndPopReceiverVariableBytecode: (in category 'bytecode generators') ----- + genSistaExtStoreAndPopReceiverVariableBytecode: boolean + | index | + extB := 0. "Simple cogit don't use the extra flags" + index := byte1 + (extA << 8). + extA := 0. + ^(coInterpreter isWriteMediatedContextInstVarIndex: index) + ifTrue: [self genStorePop: boolean MaybeContextReceiverVariable: index ] + ifFalse: [self genStorePop: boolean ReceiverVariable: index ]! Item was added: + ----- Method: SimpleStackBasedCogit>>genSistaExtStoreLiteralVariableBytecode (in category 'bytecode generators') ----- + genSistaExtStoreLiteralVariableBytecode + ^ self genSistaExtStoreLiteralVariableBytecode: false! Item was added: + ----- Method: SimpleStackBasedCogit>>genSistaExtStoreLiteralVariableBytecode: (in category 'bytecode generators') ----- + genSistaExtStoreLiteralVariableBytecode: boolean + | index | + extB := 0. "SimpleCogit don't use the extra flags" + index := byte1 + (extA << 8). + extA := 0. + ^ self genStorePop: boolean LiteralVariable: index! Item was added: + ----- Method: SimpleStackBasedCogit>>genSistaExtStoreReceiverVariableBytecode (in category 'bytecode generators') ----- + genSistaExtStoreReceiverVariableBytecode + ^ self genSistaExtStoreAndPopReceiverVariableBytecode: false! 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 genSistaExtStoreAndPopReceiverVariableBytecode isInstVarRef isMappedIfImmutability) + (2 241 241 genSistaExtStoreAndPopLiteralVariableBytecode isMappedIfImmutability) - (2 240 240 genExtStoreAndPopReceiverVariableBytecode isInstVarRef isMappedIfImmutability) - (2 241 241 genExtStoreAndPopLiteralVariableBytecode isMappedIfImmutability) (2 242 242 genLongStoreAndPopTemporaryVariableBytecode) + (2 243 243 genSistaExtStoreReceiverVariableBytecode isInstVarRef isMappedIfImmutability) + (2 244 244 genSistaExtStoreLiteralVariableBytecode isMappedIfImmutability) - (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 genExtPushRemoteTempOrInstVarLongBytecode) + (3 252 252 genExtStoreRemoteTempOrInstVarLongBytecode isMappedIfImmutability) + (3 253 253 genExtStoreAndPopRemoteTempOrInstVarLongBytecode isMappedIfImmutability) - (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 added: + ----- Method: StackToRegisterMappingCogit>>extBSpecifiesMaybeContext (in category 'bytecode generators') ----- + extBSpecifiesMaybeContext + <inline: true> + ^ extB anyMask: 2! Item was added: + ----- Method: StackToRegisterMappingCogit>>extBSpecifiesNoStoreCheck (in category 'bytecode generator support') ----- + extBSpecifiesNoStoreCheck + <inline: true> + ^ extB noMask: 1! Item was added: + ----- Method: StackToRegisterMappingCogit>>genExtPushRemoteTempOrInstVarLongBytecode (in category 'bytecode generators') ----- + genExtPushRemoteTempOrInstVarLongBytecode + | index maybeContext | + ^ (byte2 noMask: 1 << 7) + ifTrue: [ self genPushRemoteTempLongBytecode ] + ifFalse: + [ maybeContext := self extBSpecifiesMaybeContext. + index := byte1 + (extA << 8). + extA := 0. + extB := 0. + ((coInterpreter isReadMediatedContextInstVarIndex: index) and: [ maybeContext ]) + ifTrue: [ self genPushMaybeContextRemoteInstVar: index inObjectAt: byte2 - (1 << 7) ] + ifFalse: [ self genPushRemoteInstVar: index inObjectAt: byte2 - (1 << 7) ] ]! Item was added: + ----- Method: StackToRegisterMappingCogit>>genExtStorePopRemoteTempOrInstVarLongBytecode: (in category 'bytecode generators') ----- + genExtStorePopRemoteTempOrInstVarLongBytecode: boolean + | index maybeContext needsStoreCheck | + needsStoreCheck := self sistaNeedsStoreCheck. + maybeContext := self extBSpecifiesMaybeContext. + extB := 0. + (byte2 noMask: 1 << 7) + ifTrue: + [ self genStorePop: boolean RemoteTemp: byte1 At: byte2 needsStoreCheck: needsStoreCheck. + self cppIf: IMMUTABILITY ifTrue: [ self annotateBytecode: self Label ] ] + ifFalse: + [ index := byte1 + (extA << 8). + extA := 0. + ((coInterpreter isWriteMediatedContextInstVarIndex: index) and: [ maybeContext ]) + ifTrue: [ self + genStorePop: boolean + MaybeContextRemoteInstVar: index + ofObjectAt: byte2 - (1 << 7) + needsStoreCheck: needsStoreCheck ] + ifFalse: [ self + genStorePop: boolean + RemoteInstVar: index + ofObjectAt: byte2 - (1 << 7) + needsStoreCheck: needsStoreCheck ] ]. + ^ 0! Item was added: + ----- Method: StackToRegisterMappingCogit>>genImmCheckStorePop:MaybeContextSlotIndex:needsStoreCheck: (in category 'bytecode generator support') ----- + genImmCheckStorePop: popBoolean MaybeContextSlotIndex: slotIndex needsStoreCheck: needsStoreCheck + <inline: true> + | 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." + self assert: needsFrame. + 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: needsStoreCheck + needRestoreRcvr: true. + jmpDone jmpTarget: self Label. + ^0! Item was added: + ----- Method: StackToRegisterMappingCogit>>genImmCheckStorePop:slotIndex:destReg:needsStoreCheck:needsRestoreRcvr: (in category 'bytecode generator support') ----- + genImmCheckStorePop: popBoolean slotIndex: slotIndex destReg: destReg needsStoreCheck: needsStoreCheck needsRestoreRcvr: needsRestoreReceiver + <inline: true> + self ssAllocateRequiredReg: ClassReg. + "we replace the top value for the flush" + self ssStoreAndReplacePop: popBoolean toReg: ClassReg. + self ssFlushTo: simStackPtr. + objectRepresentation + genStoreWithImmutabilityCheckSourceReg: ClassReg + slotIndex: slotIndex + destReg: destReg + scratchReg: TempReg + needsStoreCheck: needsStoreCheck + needRestoreRcvr: needsRestoreReceiver.! Item was removed: - ----- 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 := (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 removed: - ----- 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 := (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 removed: - ----- Method: StackToRegisterMappingCogit>>genImmutabilityCheckStorePop:ReceiverVariable: (in category 'bytecode generator support') ----- - genImmutabilityCheckStorePop: popBoolean ReceiverVariable: slotIndex - <inline: true> - | needStoreCheck | - self assert: needsFrame. - 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>>genLoadLiteralVariable:in: (in category 'bytecode generator support') ----- + genLoadLiteralVariable: litVarIndex in: destReg + <inline: true> + | association | + association := self getLiteral: litVarIndex. + destReg = ReceiverResultReg ifTrue: [ optStatus isReceiverResultRegLive: false ]. + self ssAllocateRequiredReg: destReg. + self genMoveConstant: association R: destReg. + objectRepresentation genEnsureObjInRegNotForwarded: destReg scratchReg: TempReg.! Item was added: + ----- Method: StackToRegisterMappingCogit>>genLoadUnFwdTemp:in: (in category 'bytecode generator support') ----- + genLoadUnFwdTemp: objectIndex in: destReg + destReg = ReceiverResultReg ifTrue: [ optStatus isReceiverResultRegLive: false ]. + self ssAllocateRequiredReg: destReg. + self MoveMw: (self frameOffsetOfTemporary: objectIndex) r: FPReg R: destReg. + objectRepresentation + genEnsureOopInRegNotForwarded: destReg + scratchReg: TempReg.! Item was changed: ----- Method: StackToRegisterMappingCogit>>genPushMaybeContextReceiverVariable: (in category 'bytecode generator support') ----- genPushMaybeContextReceiverVariable: slotIndex <inline: false> - | jmpSingle jmpDone | - <var: #jmpSingle type: #'AbstractInstruction *'> - <var: #jmpDone type: #'AbstractInstruction *'> - self assert: needsFrame. self ssAllocateCallReg: ReceiverResultReg and: SendNumArgsReg. self ensureReceiverResultRegContainsSelf. + ^ self genPushMaybeContextSlotIndex: slotIndex! - (self register: ReceiverResultReg isInMask: callerSavedRegMask) ifTrue: - ["We have no way of reloading ReceiverResultReg since we need the inst var value as the result." - optStatus isReceiverResultRegLive: false]. - "See CoInterpreter>>contextInstructionPointer:frame: for an explanation - of the instruction pointer slot handling." - slotIndex = InstructionPointerIndex ifTrue: - [self MoveCq: slotIndex R: SendNumArgsReg. - self CallRT: ceFetchContextInstVarTrampoline. - ^self ssPushRegister: SendNumArgsReg]. - objectRepresentation - genLoadSlot: SenderIndex - sourceReg: ReceiverResultReg - destReg: TempReg. - jmpSingle := objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg. - self MoveCq: slotIndex R: SendNumArgsReg. - self CallRT: ceFetchContextInstVarTrampoline. - jmpDone := self Jump: 0. - jmpSingle jmpTarget: self Label. - objectRepresentation - genLoadSlot: slotIndex - sourceReg: ReceiverResultReg - destReg: SendNumArgsReg. - jmpDone jmpTarget: self Label. - ^self ssPushRegister: SendNumArgsReg! Item was added: + ----- Method: StackToRegisterMappingCogit>>genPushMaybeContextRemoteInstVar:inObjectAt: (in category 'bytecode generator support') ----- + genPushMaybeContextRemoteInstVar: slotIndex inObjectAt: index + <inline: false> + self ssAllocateCallReg: ReceiverResultReg and: SendNumArgsReg. + self genLoadUnFwdTemp: index in: ReceiverResultReg. + ^ self genPushMaybeContextSlotIndex: slotIndex! Item was added: + ----- Method: StackToRegisterMappingCogit>>genPushMaybeContextSlotIndex: (in category 'bytecode generator support') ----- + genPushMaybeContextSlotIndex: slotIndex + <inline: true> + "This method expects ReceiverResultReg to hold the object read" + | jmpSingle jmpDone | + <var: #jmpSingle type: #'AbstractInstruction *'> + <var: #jmpDone type: #'AbstractInstruction *'> + self assert: needsFrame. + (self register: ReceiverResultReg isInMask: callerSavedRegMask) ifTrue: + ["We have no way of reloading ReceiverResultReg since we need the inst var value as the result." + optStatus isReceiverResultRegLive: false]. + "See CoInterpreter>>contextInstructionPointer:frame: for an explanation + of the instruction pointer slot handling." + slotIndex = InstructionPointerIndex ifTrue: + [self MoveCq: slotIndex R: SendNumArgsReg. + self CallRT: ceFetchContextInstVarTrampoline. + ^self ssPushRegister: SendNumArgsReg]. + objectRepresentation + genLoadSlot: SenderIndex + sourceReg: ReceiverResultReg + destReg: TempReg. + jmpSingle := objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg. + self MoveCq: slotIndex R: SendNumArgsReg. + self CallRT: ceFetchContextInstVarTrampoline. + jmpDone := self Jump: 0. + jmpSingle jmpTarget: self Label. + objectRepresentation + genLoadSlot: slotIndex + sourceReg: ReceiverResultReg + destReg: SendNumArgsReg. + jmpDone jmpTarget: self Label. + ^self ssPushRegister: SendNumArgsReg! Item was added: + ----- Method: StackToRegisterMappingCogit>>genPushRemoteInstVar:inObjectAt: (in category 'bytecode generator support') ----- + genPushRemoteInstVar: index inObjectAt: objectIndex + <inline: false> + | objectReg resultReg | + self assert: needsFrame. + objectReg := self allocateRegNotConflictingWith: 0. + self genLoadUnFwdTemp: objectIndex in: objectReg. + resultReg := self availableRegOrNoneNotConflictingWith: (self registerMaskFor: objectReg). + resultReg = NoReg ifTrue: [resultReg := objectReg]. + objectRepresentation + genLoadSlot: byte1 + sourceReg: objectReg + destReg: resultReg. + ^self ssPushRegister: resultReg! Item was added: + ----- Method: StackToRegisterMappingCogit>>genSistaExtStoreAndPopReceiverVariableBytecode: (in category 'bytecode generators') ----- + genSistaExtStoreAndPopReceiverVariableBytecode: boolean + | index needsStoreCheck | + needsStoreCheck := self sistaNeedsStoreCheck. + extB := 0. + index := byte1 + (extA << 8). + extA := 0. + ^(coInterpreter isWriteMediatedContextInstVarIndex: index) + ifTrue: [self genStorePop: boolean MaybeContextReceiverVariable: index needsStoreCheck: needsStoreCheck] + ifFalse: [self genStorePop: boolean ReceiverVariable: index needsStoreCheck: needsStoreCheck]! Item was added: + ----- Method: StackToRegisterMappingCogit>>genSistaExtStoreLiteralVariableBytecode: (in category 'bytecode generators') ----- + genSistaExtStoreLiteralVariableBytecode: boolean + | index needsStoreCheck | + needsStoreCheck := self sistaNeedsStoreCheck. + extB := 0. + index := byte1 + (extA << 8). + extA := 0. + ^ self genStorePop: boolean LiteralVariable: index needsStoreCheck: needsStoreCheck! Item was changed: ----- Method: StackToRegisterMappingCogit>>genStorePop:LiteralVariable: (in category 'bytecode generator support') ----- genStorePop: popBoolean LiteralVariable: litVarIndex <inline: false> + self genStorePop: popBoolean LiteralVariable: litVarIndex needsStoreCheck: self ssTopNeedsStoreCheck. + ^ 0 - self - cppIf: IMMUTABILITY - ifTrue: [ ^ self genImmutabilityCheckStorePop: popBoolean LiteralVariable: litVarIndex ] - ifFalse: [ ^ self genVanillaStorePop: popBoolean LiteralVariable: litVarIndex ] ! Item was added: + ----- Method: StackToRegisterMappingCogit>>genStorePop:LiteralVariable:needsStoreCheck: (in category 'bytecode generator support') ----- + genStorePop: popBoolean LiteralVariable: litVarIndex needsStoreCheck: needsStoreCheck + <inline: false> + "We need a frame because the association has to be in ReceiverResultReg for the various trampolines + and ReceiverResultReg holds only the receiver in frameless methods." + self assert: needsFrame. + self genLoadLiteralVariable: litVarIndex in: ReceiverResultReg. + self + genStorePop: popBoolean + slotIndex: ValueIndex + destReg: ReceiverResultReg + needsStoreCheck: needsStoreCheck + needsRestoreRcvr: false. + ^ 0 + ! Item was changed: ----- Method: StackToRegisterMappingCogit>>genStorePop:MaybeContextReceiverVariable: (in category 'bytecode generator support') ----- + genStorePop: popBoolean MaybeContextReceiverVariable: slotIndex - genStorePop: popBoolean MaybeContextReceiverVariable: slotIndex <inline: false> + self genStorePop: popBoolean MaybeContextReceiverVariable: slotIndex needsStoreCheck: self ssTopNeedsStoreCheck. + ^ 0! - self - cppIf: IMMUTABILITY - ifTrue: [ ^ self genImmutabilityCheckStorePop: popBoolean MaybeContextReceiverVariable: slotIndex ] - ifFalse: [ ^ self genVanillaStorePop: popBoolean MaybeContextReceiverVariable: slotIndex ]! Item was added: + ----- Method: StackToRegisterMappingCogit>>genStorePop:MaybeContextReceiverVariable:needsStoreCheck: (in category 'bytecode generator support') ----- + genStorePop: popBoolean MaybeContextReceiverVariable: slotIndex needsStoreCheck: needsStoreCheck + <inline: false> + "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. + self ensureReceiverResultRegContainsSelf. + self genStorePop: popBoolean MaybeContextSlotIndex: slotIndex needsStoreCheck: needsStoreCheck. + ^ 0! Item was added: + ----- Method: StackToRegisterMappingCogit>>genStorePop:MaybeContextRemoteInstVar:ofObjectAt:needsStoreCheck: (in category 'bytecode generator support') ----- + genStorePop: popBoolean MaybeContextRemoteInstVar: slotIndex ofObjectAt: objectIndex needsStoreCheck: needsStoreCheck + <inline: false> + "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 genLoadUnFwdTemp: objectIndex in: ReceiverResultReg. + self genStorePop: popBoolean MaybeContextSlotIndex: slotIndex needsStoreCheck: needsStoreCheck. + ^ 0! Item was added: + ----- Method: StackToRegisterMappingCogit>>genStorePop:MaybeContextSlotIndex:needsStoreCheck: (in category 'bytecode generator support') ----- + genStorePop: popBoolean MaybeContextSlotIndex: slotIndex needsStoreCheck: needsStoreCheck + <inline: true> + "This method expects ReceiverResultReg to hold the object to store into. It has to be ReceiverResultReg for the contextINstVarTrampoline" + self + cppIf: IMMUTABILITY + ifTrue: + [ self + genImmCheckStorePop: popBoolean + MaybeContextSlotIndex: slotIndex + needsStoreCheck: needsStoreCheck ] + ifFalse: + [ self + genVanillaStorePop: popBoolean + MaybeContextSlotIndex: slotIndex + needsStoreCheck: needsStoreCheck ].! Item was changed: ----- Method: StackToRegisterMappingCogit>>genStorePop:ReceiverVariable: (in category 'bytecode generator support') ----- genStorePop: popBoolean ReceiverVariable: slotIndex <inline: false> + self genStorePop: popBoolean ReceiverVariable: slotIndex needsStoreCheck: self ssTopNeedsStoreCheck. + ^ 0 - self - cppIf: IMMUTABILITY - ifTrue: [ ^ self genImmutabilityCheckStorePop: popBoolean ReceiverVariable: slotIndex ] - ifFalse: [ ^ self genVanillaStorePop: popBoolean ReceiverVariable: slotIndex ] ! Item was added: + ----- Method: StackToRegisterMappingCogit>>genStorePop:ReceiverVariable:needsStoreCheck: (in category 'bytecode generator support') ----- + genStorePop: popBoolean ReceiverVariable: slotIndex needsStoreCheck: needsStoreCheck + <inline: false> + self ssFlushUpThroughReceiverVariable: slotIndex. + self ensureReceiverResultRegContainsSelf. + self + genStorePop: popBoolean + slotIndex: slotIndex + destReg: ReceiverResultReg + needsStoreCheck: needsStoreCheck + needsRestoreRcvr: true. + ^ 0 + ! Item was added: + ----- Method: StackToRegisterMappingCogit>>genStorePop:RemoteInstVar:ofObjectAt:needsStoreCheck: (in category 'bytecode generator support') ----- + genStorePop: popBoolean RemoteInstVar: slotIndex ofObjectAt: objectIndex needsStoreCheck: needsStoreCheck + <inline: false> + self assert: needsFrame. + self genLoadUnFwdTemp: objectIndex in: ReceiverResultReg. + self + genStorePop: popBoolean + slotIndex: slotIndex + destReg: ReceiverResultReg + needsStoreCheck: needsStoreCheck + needsRestoreRcvr: false. + ^ 0! Item was changed: ----- Method: StackToRegisterMappingCogit>>genStorePop:RemoteTemp:At: (in category 'bytecode generator support') ----- genStorePop: popBoolean RemoteTemp: slotIndex At: remoteTempIndex <inline: false> + ^ self genStorePop: popBoolean RemoteTemp: slotIndex At: remoteTempIndex needsStoreCheck: self ssTopNeedsStoreCheck! - | 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 ssStoreAndReplacePop: popBoolean toReg: topReg. - self MoveMw: (self frameOffsetOfTemporary: remoteTempIndex) r: FPReg R: ReceiverResultReg. - ^objectRepresentation - genStoreSourceReg: topReg - slotIndex: slotIndex - destReg: ReceiverResultReg - scratchReg: TempReg - inFrame: needsFrame - needsStoreCheck: needStoreCheck! Item was added: + ----- Method: StackToRegisterMappingCogit>>genStorePop:RemoteTemp:At:needsStoreCheck: (in category 'bytecode generator support') ----- + genStorePop: popBoolean RemoteTemp: slotIndex At: remoteTempIndex needsStoreCheck: needsStoreCheck + <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." + 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." + self ssAllocateRequiredReg: ReceiverResultReg. + optStatus isReceiverResultRegLive: false. + self MoveMw: (self frameOffsetOfTemporary: remoteTempIndex) r: FPReg R: ReceiverResultReg. + self genVanillaStorePop: popBoolean slotIndex: slotIndex destReg: ReceiverResultReg needsStoreCheck: needsStoreCheck. + ^ 0! Item was added: + ----- Method: StackToRegisterMappingCogit>>genStorePop:slotIndex:destReg:needsStoreCheck:needsRestoreRcvr: (in category 'bytecode generator support') ----- + genStorePop: popBoolean slotIndex: slotIndex destReg: destReg needsStoreCheck: needsStoreCheck needsRestoreRcvr: needsRestoreReceiver + <inline: true> + "This method expects destReg to hold the object to store into. In practice, it is almost always RcvrResultReg because it is mandatory for the various store checks. We could put any register there if no store check is needed" + self + cppIf: IMMUTABILITY + ifTrue: + [ self + genImmCheckStorePop: popBoolean + slotIndex: slotIndex + destReg: destReg + needsStoreCheck: needsStoreCheck + needsRestoreRcvr: needsRestoreReceiver ] + ifFalse: + [ self + genVanillaStorePop: popBoolean + slotIndex: slotIndex + destReg: destReg + needsStoreCheck: needsStoreCheck ]. + ! Item was removed: - ----- 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 := (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 removed: - ----- 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 := (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 added: + ----- Method: StackToRegisterMappingCogit>>genVanillaStorePop:MaybeContextSlotIndex:needsStoreCheck: (in category 'bytecode generator support') ----- + genVanillaStorePop: popBoolean MaybeContextSlotIndex: slotIndex needsStoreCheck: needsStoreCheck + <inline: true> + | jmpSingle jmpDone | + <var: #jmpSingle type: #'AbstractInstruction *'> + <var: #jmpDone type: #'AbstractInstruction *'> + + 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: needsStoreCheck. + jmpDone jmpTarget: self Label. + + ^0! Item was removed: - ----- Method: StackToRegisterMappingCogit>>genVanillaStorePop:ReceiverVariable: (in category 'bytecode generator support') ----- - genVanillaStorePop: popBoolean ReceiverVariable: slotIndex - <inline: true> - | topReg needStoreCheck | - self ssFlushUpThroughReceiverVariable: slotIndex. - 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:slotIndex:destReg:needsStoreCheck: (in category 'bytecode generator support') ----- + genVanillaStorePop: popBoolean slotIndex: slotIndex destReg: destReg needsStoreCheck: needsStoreCheck + <inline: true> + | topReg | + topReg := self + allocateRegForStackEntryAt: 0 + notConflictingWith: (self registerMaskFor: destReg). + self ssStorePop: popBoolean toReg: topReg. + objectRepresentation + genStoreSourceReg: topReg + slotIndex: slotIndex + destReg: destReg + scratchReg: TempReg + inFrame: needsFrame + needsStoreCheck: needsStoreCheck.! Item was added: + ----- Method: StackToRegisterMappingCogit>>sistaNeedsStoreCheck (in category 'bytecode generator support') ----- + sistaNeedsStoreCheck + <inline: true> + "The store check can be ignored if the value assigned doesn't need it (immediate, etc) + In addition, the extB low bit is marked by the optimizer if the store check is not required" + ^ self ssTopNeedsStoreCheck and: [ self extBSpecifiesNoStoreCheck ]! Item was added: + ----- Method: StackToRegisterMappingCogit>>ssTopNeedsStoreCheck (in category 'bytecode generator support') ----- + ssTopNeedsStoreCheck + <inline: true> + ^ (objectRepresentation isUnannotatableConstant: self ssTop) not!

1 0

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

06 Apr '16

Nicolas Cellier uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-nice.1765.mcz ==================== Summary ==================== Name: VMMaker.oscog-nice.1765 Author: nice Time: 6 April 2016, 12:28:15.115 am UUID: 7a029a58-3e12-425a-aaa7-13b94d1ddee7 Ancestors: VMMaker.oscog-nice.1764 Ah, yet another simulator species that need support for byteSwapped32IfBigEndian: (resp. 64) =============== Diff against VMMaker.oscog-nice.1764 =============== Item was added: + ----- Method: StackInterpreterSimulatorLSB>>byteSwapped32IfBigEndian: (in category 'memory access') ----- + byteSwapped32IfBigEndian: w + ^w bitAnd: 16rFFFFFFFF! Item was added: + ----- Method: StackInterpreterSimulatorLSB>>byteSwapped64IfBigEndian: (in category 'memory access') ----- + byteSwapped64IfBigEndian: w + ^w bitAnd: 16rFFFFFFFFFFFFFFFF!

1 0

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

06 Apr '16

Nicolas Cellier uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-nice.1764.mcz ==================== Summary ==================== Name: VMMaker.oscog-nice.1764 Author: nice Time: 6 April 2016, 12:18:06.794 am UUID: c776e6b6-a8ad-46a8-89c9-15460bf25c9a Ancestors: VMMaker.oscog-cb.1763 Provide missing spur simulator messages byteSwapped32IfBigEndian: and byteSwapped64IfBigEndian: =============== Diff against VMMaker.oscog-cb.1763 =============== Item was added: + ----- Method: Spur32BitMMLECoSimulator>>byteSwapped32IfBigEndian: (in category 'memory access') ----- + byteSwapped32IfBigEndian: w + ^w bitAnd: 16rFFFFFFFF! Item was added: + ----- Method: Spur32BitMMLECoSimulator>>byteSwapped64IfBigEndian: (in category 'memory access') ----- + byteSwapped64IfBigEndian: w + ^w bitAnd: 16rFFFFFFFFFFFFFFFF! Item was added: + ----- Method: Spur32BitMMLESimulator>>byteSwapped32IfBigEndian: (in category 'memory access') ----- + byteSwapped32IfBigEndian: w + ^w bitAnd: 16rFFFFFFFF! Item was added: + ----- Method: Spur32BitMMLESimulator>>byteSwapped64IfBigEndian: (in category 'memory access') ----- + byteSwapped64IfBigEndian: w + ^w bitAnd: 16rFFFFFFFFFFFFFFFF! Item was added: + ----- Method: Spur64BitMMLECoSimulator>>byteSwapped32IfBigEndian: (in category 'memory access') ----- + byteSwapped32IfBigEndian: w + ^w bitAnd: 16rFFFFFFFF! Item was added: + ----- Method: Spur64BitMMLECoSimulator>>byteSwapped64IfBigEndian: (in category 'memory access') ----- + byteSwapped64IfBigEndian: w + ^w bitAnd: 16rFFFFFFFFFFFFFFFF! Item was added: + ----- Method: Spur64BitMMLESimulator>>byteSwapped32IfBigEndian: (in category 'memory access') ----- + byteSwapped32IfBigEndian: w + ^w bitAnd: 16rFFFFFFFF! Item was added: + ----- Method: Spur64BitMMLESimulator>>byteSwapped64IfBigEndian: (in category 'memory access') ----- + byteSwapped64IfBigEndian: w + ^w bitAnd: 16rFFFFFFFFFFFFFFFF!

1 0

Re: [Vm-dev] VM Maker: VMMaker.oscog-cb.1763.mcz
by Nicolas Cellier 05 Apr '16

05 Apr '16

No problem, my next commit will restart from cb.1763 2016-04-05 20:52 GMT+02:00 <commits(a)source.squeak.org>: > > 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

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