[Vm-dev] VM Maker: VMMaker.oscog-eem.851.mcz
commits at source.squeak.org
commits at source.squeak.org
Sat Aug 9 17:43:09 UTC 2014
Eliot Miranda uploaded a new version of VMMaker to project VM Maker:
http://source.squeak.org/VMMaker/VMMaker.oscog-eem.851.mcz
==================== Summary ====================
Name: VMMaker.oscog-eem.851
Author: eem
Time: 9 August 2014, 10:40:40.252 am
UUID: 54313625-56b1-41ea-87f9-088d0e9903f0
Ancestors: VMMaker.oscog-eem.850
Provide SpurMemoryManager>>isCompiledMethodFormat:
for bootstrap.
Fix NewspeakV3 on Spur:
Replace genPushExplicitOuterReceiverBytecode with
callPrimitiveBytecode in NewspeakV4 table on Spur.
methodHeaderOf: needs to be <api> for cogits.
Fix return in validInstructionPointer:inMethod:framePointer:
for MULTIPLEBYTECODESETS
=============== Diff against VMMaker.oscog-eem.850 ===============
Item was changed:
----- Method: NewCoObjectMemory>>methodHeaderOf: (in category 'memory access') -----
methodHeaderOf: methodObj
"Answer the method header of a CompiledMethod object.
If the method has been cogged then the header is a pointer to
the CogMethod and the real header will be stored in the CogMethod."
+ <api>
<inline: true>
| header |
self assert: (self isCompiledMethod: methodObj).
header := self fetchPointer: HeaderIndex ofObject: methodObj.
^(self isIntegerObject: header)
ifTrue: [header]
ifFalse:
[self assert: header asUnsignedInteger < coInterpreter heapBase.
self assert: (coInterpreter cCoerceSimple: header to: #'CogMethod *') objectHeader
= self nullHeaderForMachineCodeMethod..
(coInterpreter cCoerceSimple: header to: #'CogMethod *') methodHeader]!
Item was changed:
----- Method: NewObjectMemory>>literalCountOfMethodHeader: (in category 'memory access') -----
literalCountOfMethodHeader: header
+ <api>
<inline: true>
self assert: (self isIntegerObject: header).
^(coInterpreter headerIndicatesAlternateBytecodeSet: header)
ifTrue: [coInterpreter literalCountOfAlternateHeader: header]
ifFalse: [coInterpreter literalCountOfOriginalHeader: header]!
Item was changed:
----- Method: SimpleStackBasedCogit class>>initializeBytecodeTableForNewspeakV3PlusClosures (in category 'class initialization') -----
initializeBytecodeTableForNewspeakV3PlusClosures
"SimpleStackBasedCogit initializeBytecodeTableForNewspeakV3PlusClosures"
NSSendIsPCAnnotated := true. "IsNSSendCall used by PushImplicitReceiver"
FirstSpecialSelector := 176.
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 0 15 genPushReceiverVariableBytecode)
(1 16 31 genPushTemporaryVariableBytecode)
(1 32 63 genPushLiteralConstantBytecode needsFrameNever: 1)
(1 64 95 genPushLiteralVariableBytecode needsFrameNever: 1)
(1 96 103 genStoreAndPopReceiverVariableBytecode needsFrameNever: -1) "N.B. not frameless if immutability"
(1 104 111 genStoreAndPopTemporaryVariableBytecode)
(1 112 112 genPushReceiverBytecode)
(1 113 113 genPushConstantTrueBytecode needsFrameNever: 1)
(1 114 114 genPushConstantFalseBytecode needsFrameNever: 1)
(1 115 115 genPushConstantNilBytecode needsFrameNever: 1)
(1 116 119 genPushQuickIntegerConstantBytecode needsFrameNever: 1)
"method returns in blocks need a frame because of nonlocalReturn:through:"
(1 120 120 genReturnReceiver return needsFrameIfInBlock: isMappedInBlock 0)
(1 121 121 genReturnTrue return needsFrameIfInBlock: isMappedInBlock 0)
(1 122 122 genReturnFalse return needsFrameIfInBlock: isMappedInBlock 0)
(1 123 123 genReturnNil return needsFrameIfInBlock: isMappedInBlock 0)
(1 124 124 genReturnTopFromMethod return needsFrameIfInBlock: isMappedInBlock -1)
(1 125 125 genReturnTopFromBlock return needsFrameNever: -1)
(3 126 126 genDynamicSuperSendBytecode isMapped) "Newspeak"
(2 127 127 genPushImplicitReceiverBytecode isMapped hasIRC) "Newspeak"
(2 128 128 extendedPushBytecode needsFrameNever: 1)
(2 129 129 extendedStoreBytecode)
(2 130 130 extendedStoreAndPopBytecode)
(2 131 131 genExtendedSendBytecode isMapped)
(3 132 132 doubleExtendedDoAnythingBytecode isMapped)
(2 133 133 genExtendedSuperBytecode isMapped)
(2 134 134 genSecondExtendedSendBytecode isMapped)
(1 135 135 genPopStackBytecode needsFrameNever: -1)
(1 136 136 duplicateTopBytecode needsFrameNever: 1)
(1 137 137 genPushActiveContextBytecode)
+ (2 138 138 genPushNewArrayBytecode)),
- (2 138 138 genPushNewArrayBytecode)
+ ((initializationOptions at: #SpurObjectMemory ifAbsent: [false])
+ ifTrue: [#((3 139 139 callPrimitiveBytecode))] "V3PlusClosures on Spur"
+ ifFalse: [#((2 139 139 genPushExplicitOuterReceiverBytecode isMapped))]), "Newspeak"
- (2 139 139 genPushExplicitOuterReceiverBytecode isMapped) "Newspeak"
+ #(
(3 140 140 genPushRemoteTempLongBytecode)
(3 141 141 genStoreRemoteTempLongBytecode)
(3 142 142 genStoreAndPopRemoteTempLongBytecode)
(4 143 143 genPushClosureCopyCopiedValuesBytecode block v3:Block:Code:Size:)
(1 144 151 genShortUnconditionalJump branch v3:ShortForward:Branch:Distance:)
(1 152 159 genShortJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean"
v3:ShortForward:Branch:Distance:)
(2 160 163 genLongUnconditionalBackwardJump branch isMapped "because of interrupt check"
v3:Long:Branch:Distance:)
(2 164 167 genLongUnconditionalForwardJump branch v3:Long:Branch:Distance:)
(2 168 171 genLongJumpIfTrue branch isBranchTrue isMapped "because of mustBeBoolean"
v3:LongForward:Branch:Distance:)
(2 172 175 genLongJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean"
v3:LongForward:Branch:Distance:)
(1 176 197 genSpecialSelectorSend isMapped)
(1 198 198 genSpecialSelectorEqualsEquals needsFrameNever: notMapped -1) "not mapped because it is directly inlined (for now)"
(1 199 199 genSpecialSelectorClass needsFrameNever: notMapped 0) "not mapped because it is directly inlined (for now)"
(1 200 207 genSpecialSelectorSend isMapped)
(1 208 223 genSendLiteralSelector0ArgsBytecode isMapped)
(1 224 239 genSendLiteralSelector1ArgBytecode isMapped)
(1 240 255 genSendLiteralSelector2ArgsBytecode isMapped))!
Item was changed:
----- Method: Spur32BitCoMemoryManager>>methodHeaderOf: (in category 'growing/shrinking memory') -----
methodHeaderOf: methodObj
"Answer the method header of a CompiledMethod object.
If the method has been cogged then the header is a pointer to
the CogMethod and the real header will be stored in the CogMethod."
+ <api>
<inline: true>
| header |
self assert: (self isCompiledMethod: methodObj).
header := self fetchPointer: HeaderIndex ofObject: methodObj.
^(self isIntegerObject: header)
ifTrue: [header]
ifFalse:
[self assert: header asUnsignedInteger < newSpaceStart.
self assert: (coInterpreter cCoerceSimple: header to: #'CogMethod *') objectHeader
= self nullHeaderForMachineCodeMethod..
(coInterpreter cCoerceSimple: header to: #'CogMethod *') methodHeader]!
Item was added:
+ ----- Method: SpurMemoryManager>>isCompiledMethodFormat: (in category 'header formats') -----
+ isCompiledMethodFormat: format
+ ^format >= self firstCompiledMethodFormat!
Item was changed:
----- Method: SpurMemoryManager>>literalCountOfMethodHeader: (in category 'method access') -----
literalCountOfMethodHeader: header
+ <api>
<inline: true>
self assert: (self isIntegerObject: header).
^(self integerValueOf: header) bitAnd: 16rFFFF!
Item was changed:
----- Method: StackInterpreter>>validInstructionPointer:inMethod:framePointer: (in category 'debug support') -----
validInstructionPointer: theInstrPointer inMethod: aMethod framePointer: fp
<var: #theInstrPointer type: #usqInt>
<var: #aMethod type: #usqInt>
<var: #fp type: #'char *'>
| methodHeader |
objectMemory hasSpurMemoryManagerAPI ifTrue:
[methodHeader := self noAssertHeaderOf: aMethod. "-1 for pre-increment in fetchNextBytecode"
^theInstrPointer >= (aMethod + (objectMemory lastPointerOf: aMethod) + BytesPerOop - 1)
and: [theInstrPointer < (aMethod + (objectMemory numBytesOf: aMethod) + BaseHeaderSize - 1)
and: ["If the method starts with a CallPrimitive opcode the instruction pointer should be past it."
((self alternateHeaderHasPrimitiveFlag: methodHeader)
and: [theInstrPointer < (aMethod
+ BytesPerOop - 1
+ (objectMemory lastPointerOf: aMethod)
+ (self sizeOfCallPrimitiveBytecode: methodHeader))])
not]]].
MULTIPLEBYTECODESETS ifTrue:
[methodHeader := self noAssertHeaderOf: aMethod. "-1 for pre-increment in fetchNextBytecode"
+ ^theInstrPointer >= (aMethod + (objectMemory lastPointerOf: aMethod) + BytesPerOop - 1)
+ and: [theInstrPointer < (aMethod + (objectMemory numBytesOf: aMethod) + BaseHeaderSize - 1)
+ and: ["If the method starts with a CallPrimitive opcode the instruction pointer should be past it."
+ ((self headerIndicatesAlternateBytecodeSet: methodHeader)
- theInstrPointer >= (aMethod + (objectMemory lastPointerOf: aMethod) + BytesPerOop - 1)
- and: [theInstrPointer < (aMethod + (objectMemory numBytesOf: aMethod) + BaseHeaderSize - 1)
- and: ["If the method starts with a CallPrimitive opcode the instruction pointer should be past it."
- ^((self headerIndicatesAlternateBytecodeSet: methodHeader)
and: [(self alternateHeaderHasPrimitiveFlag: methodHeader)
and: [theInstrPointer < (aMethod
+ BytesPerOop - 1
+ (objectMemory lastPointerOf: aMethod)
+ (self sizeOfCallPrimitiveBytecode: methodHeader))]])
not]]].
"-1 for pre-increment in fetchNextBytecode"
^theInstrPointer >= (aMethod + (objectMemory lastPointerOf: aMethod) + objectMemory bytesPerOop - 1)
and: [theInstrPointer < (aMethod + (objectMemory numBytesOf: aMethod) + objectMemory baseHeaderSize - 1)]!
Item was changed:
----- Method: StackToRegisterMappingCogit class>>initializeBytecodeTableForNewspeakV3PlusClosures (in category 'class initialization') -----
initializeBytecodeTableForNewspeakV3PlusClosures
"StackToRegisterMappingCogit initializeBytecodeTableForNewspeakV3PlusClosures"
numPushNilsFunction := #v3:Num:Push:Nils:.
pushNilSizeFunction := #v3PushNilSize:.
NSSendIsPCAnnotated := true. "IsNSSendCall used by PushImplicitReceiver"
FirstSpecialSelector := 176.
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 0 15 genPushReceiverVariableBytecode needsFrameNever: 1)
(1 16 31 genPushTemporaryVariableBytecode needsFrameIfMod16GENumArgs: 1)
(1 32 63 genPushLiteralConstantBytecode needsFrameNever: 1)
(1 64 95 genPushLiteralVariableBytecode needsFrameNever: 1)
(1 96 103 genStoreAndPopReceiverVariableBytecode needsFrameNever: -1) "N.B. not frameless if immutability"
(1 104 111 genStoreAndPopTemporaryVariableBytecode)
(1 112 112 genPushReceiverBytecode needsFrameNever: 1)
(1 113 113 genPushConstantTrueBytecode needsFrameNever: 1)
(1 114 114 genPushConstantFalseBytecode needsFrameNever: 1)
(1 115 115 genPushConstantNilBytecode needsFrameNever: 1)
(1 116 119 genPushQuickIntegerConstantBytecode needsFrameNever: 1)
"method returns in blocks need a frame because of nonlocalReturn:through:"
(1 120 120 genReturnReceiver return needsFrameIfInBlock: isMappedInBlock 0)
(1 121 121 genReturnTrue return needsFrameIfInBlock: isMappedInBlock 0)
(1 122 122 genReturnFalse return needsFrameIfInBlock: isMappedInBlock 0)
(1 123 123 genReturnNil return needsFrameIfInBlock: isMappedInBlock 0)
(1 124 124 genReturnTopFromMethod return needsFrameIfInBlock: isMappedInBlock -1)
(1 125 125 genReturnTopFromBlock return needsFrameNever: -1)
(3 126 126 genDynamicSuperSendBytecode isMapped) "Newspeak"
(2 127 127 genPushImplicitReceiverBytecode isMapped hasIRC) "Newspeak"
(2 128 128 extendedPushBytecode needsFrameNever: 1)
(2 129 129 extendedStoreBytecode)
(2 130 130 extendedStoreAndPopBytecode)
(2 131 131 genExtendedSendBytecode isMapped)
(3 132 132 doubleExtendedDoAnythingBytecode isMapped)
(2 133 133 genExtendedSuperBytecode isMapped)
(2 134 134 genSecondExtendedSendBytecode isMapped)
(1 135 135 genPopStackBytecode needsFrameNever: -1)
(1 136 136 duplicateTopBytecode needsFrameNever: 1)
(1 137 137 genPushActiveContextBytecode)
+ (2 138 138 genPushNewArrayBytecode)),
- (2 138 138 genPushNewArrayBytecode)
+ ((initializationOptions at: #SpurObjectMemory ifAbsent: [false])
+ ifTrue: [#((3 139 139 callPrimitiveBytecode))] "V3PlusClosures on Spur"
+ ifFalse: [#((2 139 139 genPushExplicitOuterReceiverBytecode isMapped))]), "Newspeak"
- (2 139 139 genPushExplicitOuterReceiverBytecode isMapped) "Newspeak"
+ #(
(3 140 140 genPushRemoteTempLongBytecode)
(3 141 141 genStoreRemoteTempLongBytecode)
(3 142 142 genStoreAndPopRemoteTempLongBytecode)
(4 143 143 genPushClosureCopyCopiedValuesBytecode block v3:Block:Code:Size:)
(1 144 151 genShortUnconditionalJump branch v3:ShortForward:Branch:Distance:)
(1 152 159 genShortJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean"
v3:ShortForward:Branch:Distance:)
(2 160 163 genLongUnconditionalBackwardJump branch isMapped "because of interrupt check"
v3:Long:Branch:Distance:)
(2 164 167 genLongUnconditionalForwardJump branch v3:Long:Branch:Distance:)
(2 168 171 genLongJumpIfTrue branch isBranchTrue isMapped "because of mustBeBoolean"
v3:LongForward:Branch:Distance:)
(2 172 175 genLongJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean"
v3:LongForward:Branch:Distance:)
(1 176 176 genSpecialSelectorArithmetic isMapped AddRR)
(1 177 177 genSpecialSelectorArithmetic isMapped SubRR)
(1 178 178 genSpecialSelectorComparison isMapped JumpLess)
(1 179 179 genSpecialSelectorComparison isMapped JumpGreater)
(1 180 180 genSpecialSelectorComparison isMapped JumpLessOrEqual)
(1 181 181 genSpecialSelectorComparison isMapped JumpGreaterOrEqual)
(1 182 182 genSpecialSelectorComparison isMapped JumpZero)
(1 183 183 genSpecialSelectorComparison isMapped JumpNonZero)
(1 184 189 genSpecialSelectorSend isMapped) " #* #/ #\\ #@ #bitShift: //"
(1 190 190 genSpecialSelectorArithmetic isMapped AndRR)
(1 191 191 genSpecialSelectorArithmetic isMapped OrRR)
(1 192 197 genSpecialSelectorSend isMapped) "#at: #at:put: #size #next #nextPut: #atEnd"
(1 198 198 genSpecialSelectorEqualsEquals needsFrameNever: notMapped -1) "not mapped because it is directly inlined (for now)"
(1 199 199 genSpecialSelectorClass needsFrameIfStackGreaterThanOne: notMapped 0) "not mapped because it is directly inlined (for now)"
(1 200 207 genSpecialSelectorSend isMapped) "#blockCopy: #value #value: #do: #new #new: #x #y"
(1 208 223 genSendLiteralSelector0ArgsBytecode isMapped)
(1 224 239 genSendLiteralSelector1ArgBytecode isMapped)
(1 240 255 genSendLiteralSelector2ArgsBytecode isMapped))!
More information about the Vm-dev
mailing list