[Vm-dev] VM Maker: VMMaker.oscog-nice.1991.mcz
commits at source.squeak.org
commits at source.squeak.org
Mon Nov 14 22:40:13 UTC 2016
Nicolas Cellier uploaded a new version of VMMaker to project VM Maker:
http://source.squeak.org/VMMaker/VMMaker.oscog-nice.1991.mcz
==================== Summary ====================
Name: VMMaker.oscog-nice.1991
Author: nice
Time: 14 November 2016, 11:38:31.514998 pm
UUID: 370028ef-d566-4f45-be6a-39fb21bde0a4
Ancestors: VMMaker.oscog-nice.1990
Fix accesss to DoubleByte integer arrays: fetchShort16:ofObject: is signed and we want an unsigned short.
Note: most memory access should be unsigned and extension to sqInt is also unecessary: we have improving slang type inference now. Non counting the divergence with VM simulator which provides mostly unsigned memory access! But for now, do the minimal change that could possibly work, not the right one.
=============== Diff against VMMaker.oscog-nice.1990 ===============
Item was changed:
----- Method: InterpreterPrimitives>>primitiveSlotAt (in category 'object access primitives') -----
primitiveSlotAt
"Answer a slot in an object. This numbers all slots from 1, ignoring the distinction between
named and indexed inst vars. In objects with both named and indexed inst vars, the named
inst vars precede the indexed ones. In non-object indexed objects (objects that contain
bits, not object references) this primitive answers the raw integral value at each slot.
e.g. for Strings it answers the character code, not the Character object at each slot."
| index rcvr fmt numSlots |
index := self stackTop.
rcvr := self stackValue: 1.
(objectMemory isIntegerObject: index) ifFalse:
[^self primitiveFailFor: PrimErrBadArgument].
(objectMemory isImmediate: rcvr) ifTrue:
[^self primitiveFailFor: PrimErrBadReceiver].
fmt := objectMemory formatOf: rcvr.
index := (objectMemory integerValueOf: index) - 1.
fmt <= objectMemory lastPointerFormat ifTrue:
[numSlots := objectMemory numSlotsOf: rcvr.
(self asUnsigned: index) < numSlots ifTrue:
[self pop: argumentCount + 1 thenPush: (objectMemory fetchPointer: index ofObject: rcvr).
^0].
^self primitiveFailFor: PrimErrBadIndex].
fmt >= objectMemory firstByteFormat ifTrue:
[fmt >= objectMemory firstCompiledMethodFormat ifTrue:
[^self primitiveFailFor: PrimErrUnsupported].
numSlots := objectMemory numBytesOfBytes: rcvr.
(self asUnsigned: index) < numSlots ifTrue:
[self pop: argumentCount + 1 thenPushInteger: (objectMemory fetchByte: index ofObject: rcvr).
^0].
^self primitiveFailFor: PrimErrBadIndex].
(objectMemory hasSpurMemoryManagerAPI
and: [fmt >= objectMemory firstShortFormat]) ifTrue:
[numSlots := objectMemory num16BitUnitsOf: rcvr.
(self asUnsigned: index) < numSlots ifTrue:
+ [self pop: argumentCount + 1 thenPushInteger: (objectMemory fetchUnsignedShort16: index ofObject: rcvr).
- [self pop: argumentCount + 1 thenPushInteger: (objectMemory fetchShort16: index ofObject: rcvr).
^0].
^self primitiveFailFor: PrimErrBadIndex].
fmt = objectMemory sixtyFourBitIndexableFormat ifTrue:
[numSlots := objectMemory num64BitUnitsOf: rcvr.
(self asUnsigned: index) < numSlots ifTrue:
[self pop: argumentCount + 1
thenPush: (self positive64BitIntegerFor: (objectMemory fetchLong64: index ofObject: rcvr)).
^0].
^self primitiveFailFor: PrimErrBadIndex].
fmt >= objectMemory firstLongFormat ifTrue:
[numSlots := objectMemory num32BitUnitsOf: rcvr.
(self asUnsigned: index) < numSlots ifTrue:
[self pop: argumentCount + 1
thenPush: (objectMemory bytesPerOop = 8
ifTrue: [objectMemory integerObjectOf: (objectMemory fetchLong32: index ofObject: rcvr)]
ifFalse: [self positive32BitIntegerFor: (objectMemory fetchLong32: index ofObject: rcvr)]).
^0].
^self primitiveFailFor: PrimErrBadIndex].
^self primitiveFailFor: PrimErrBadReceiver!
Item was added:
+ ----- Method: ObjectMemory>>fetchUnsignedShort16:ofObject: (in category 'object access') -----
+ fetchUnsignedShort16: shortIndex ofObject: oop
+ ^self cCoerceSimple: (self shortAt: oop + self baseHeaderSize + (shortIndex << 1)) to: #'unsigned short'!
Item was added:
+ ----- Method: SpurMemoryManager>>fetchUnsignedShort16:ofObject: (in category 'object access') -----
+ fetchUnsignedShort16: shortIndex ofObject: objOop
+ ^self cCoerceSimple: (self shortAt: objOop + self baseHeaderSize + (shortIndex << 1)) to: #'unsigned short'!
Item was changed:
----- Method: StackInterpreter>>commonVariable:at:cacheIndex: (in category 'indexing primitive support') -----
commonVariable: rcvr at: index cacheIndex: atIx
"This code assumes the receiver has been identified at location atIx in the atCache."
| stSize fmt fixedFields result |
<inline: true>
stSize := atCache at: atIx+AtCacheSize.
((self oop: index isGreaterThanOrEqualTo: 1)
and: [self oop: index isLessThanOrEqualTo: stSize]) ifTrue:
[fmt := atCache at: atIx+AtCacheFmt.
fmt <= objectMemory weakArrayFormat ifTrue:
[self assert: (objectMemory isContextNonImm: rcvr) not.
fixedFields := atCache at: atIx+AtCacheFixedFields.
^objectMemory fetchPointer: index + fixedFields - 1 ofObject: rcvr].
fmt < objectMemory firstByteFormat ifTrue: "64, 32, & 16 bits"
[objectMemory hasSpurMemoryManagerAPI ifTrue:
[fmt >= objectMemory firstShortFormat ifTrue:
[^objectMemory integerObjectOf:
+ (objectMemory fetchUnsignedShort16: index - 1 ofObject: rcvr)].
- (objectMemory fetchShort16: index - 1 ofObject: rcvr)].
fmt = objectMemory sixtyFourBitIndexableFormat ifTrue:
[^self positive64BitIntegerFor:
(objectMemory fetchLong64: index - 1 ofObject: rcvr)]].
result := objectMemory fetchLong32: index - 1 ofObject: rcvr.
^self positive32BitIntegerFor: result].
fmt >= objectMemory firstStringyFakeFormat "Note fmt >= firstStringyFormat is an artificial flag for strings"
ifTrue: "String"
["Spur supports the String at:[put:] primitives on WideString and DoubleByteString"
result := (objectMemory hasSpurMemoryManagerAPI
and: [fmt < (objectMemory firstByteFormat + objectMemory firstStringyFakeFormat)])
ifTrue:
[fmt < (objectMemory firstShortFormat + objectMemory firstStringyFakeFormat)
ifTrue: [objectMemory fetchLong32: index - 1 ofObject: rcvr]
+ ifFalse: [objectMemory fetchUnsignedShort16: index - 1 ofObject: rcvr]]
- ifFalse: [objectMemory fetchShort16: index - 1 ofObject: rcvr]]
ifFalse: [objectMemory fetchByte: index - 1 ofObject: rcvr].
^self characterForAscii: result]
ifFalse:
[(fmt < objectMemory firstCompiledMethodFormat "ByteArray"
or: [index >= (self firstByteIndexOfMethod: rcvr) "CompiledMethod"]) ifTrue:
[^objectMemory integerObjectOf: (objectMemory fetchByte: index - 1 ofObject: rcvr)]]].
^self primitiveFailFor: ((objectMemory isIndexable: rcvr)
ifFalse: [PrimErrBadReceiver]
ifTrue: [PrimErrBadIndex])!
Item was changed:
----- Method: StackInterpreter>>subscript:with:format: (in category 'indexing primitive support') -----
subscript: array with: index format: fmt
"Note: This method assumes that the index is within bounds!!"
<inline: true>
fmt <= objectMemory lastPointerFormat ifTrue:
[^objectMemory fetchPointer: index - 1 ofObject: array].
fmt >= objectMemory firstByteFormat ifTrue:
[^objectMemory integerObjectOf:
(objectMemory fetchByte: index - 1 ofObject: array)].
objectMemory hasSpurMemoryManagerAPI ifTrue:
[fmt >= objectMemory firstShortFormat ifTrue:
[^objectMemory integerObjectOf:
+ (objectMemory fetchUnsignedShort16: index - 1 ofObject: array)].
- (objectMemory fetchShort16: index - 1 ofObject: array)].
fmt = objectMemory sixtyFourBitIndexableFormat ifTrue:
[^self positive64BitIntegerFor:
(objectMemory fetchLong64: index - 1 ofObject: array)]].
"32bit-word type objects; for now assume no 64-bit indexable objects"
^self positive32BitIntegerFor:
(objectMemory fetchLong32: index - 1 ofObject: array)!
Item was changed:
----- Method: StackInterpreterPrimitives>>primitiveSlotAt (in category 'object access primitives') -----
primitiveSlotAt
"Answer a slot in an object. This numbers all slots from 1, ignoring the distinction between
named and indexed inst vars. In objects with both named and indexed inst vars, the named
inst vars precede the indexed ones. In non-object indexed objects (objects that contain
bits, not object references) this primitive answers the raw integral value at each slot.
e.g. for Strings it answers the character code, not the Character object at each slot."
| index rcvr fmt numSlots |
index := self stackTop.
rcvr := self stackValue: 1.
(objectMemory isIntegerObject: index) ifFalse:
[^self primitiveFailFor: PrimErrBadArgument].
(objectMemory isImmediate: rcvr) ifTrue:
[^self primitiveFailFor: PrimErrBadReceiver].
fmt := objectMemory formatOf: rcvr.
index := (objectMemory integerValueOf: index) - 1.
fmt <= objectMemory lastPointerFormat ifTrue:
[numSlots := objectMemory numSlotsOf: rcvr.
(self asUnsigned: index) < numSlots ifTrue:
[| value numLiveSlots |
(objectMemory isContextNonImm: rcvr)
ifTrue:
[self externalWriteBackHeadFramePointers.
numLiveSlots := (self stackPointerForMaybeMarriedContext: rcvr) + CtxtTempFrameStart.
value := (self asUnsigned: index) < numLiveSlots
ifTrue: [self externalInstVar: index ofContext: rcvr]
ifFalse: [objectMemory nilObject]]
ifFalse:
[value := objectMemory fetchPointer: index ofObject: rcvr].
self pop: argumentCount + 1 thenPush: value.
^0].
^self primitiveFailFor: PrimErrBadIndex].
fmt >= objectMemory firstByteFormat ifTrue:
[fmt >= objectMemory firstCompiledMethodFormat ifTrue:
[^self primitiveFailFor: PrimErrUnsupported].
numSlots := objectMemory numBytesOfBytes: rcvr.
(self asUnsigned: index) < numSlots ifTrue:
[self pop: argumentCount + 1 thenPushInteger: (objectMemory fetchByte: index ofObject: rcvr).
^0].
^self primitiveFailFor: PrimErrBadIndex].
(objectMemory hasSpurMemoryManagerAPI
and: [fmt >= objectMemory firstShortFormat]) ifTrue:
[numSlots := objectMemory num16BitUnitsOf: rcvr.
(self asUnsigned: index) < numSlots ifTrue:
+ [self pop: argumentCount + 1 thenPushInteger: (objectMemory fetchUnsignedShort16: index ofObject: rcvr).
- [self pop: argumentCount + 1 thenPushInteger: (objectMemory fetchShort16: index ofObject: rcvr).
^0].
^self primitiveFailFor: PrimErrBadIndex].
fmt = objectMemory sixtyFourBitIndexableFormat ifTrue:
[numSlots := objectMemory num64BitUnitsOf: rcvr.
(self asUnsigned: index) < numSlots ifTrue:
[self pop: argumentCount + 1
thenPush: (self positive64BitIntegerFor: (objectMemory fetchLong64: index ofObject: rcvr)).
^0].
^self primitiveFailFor: PrimErrBadIndex].
fmt >= objectMemory firstLongFormat ifTrue:
[numSlots := objectMemory num32BitUnitsOf: rcvr.
(self asUnsigned: index) < numSlots ifTrue:
[self pop: argumentCount + 1
thenPush: (self positive32BitIntegerFor: (objectMemory fetchLong32: index ofObject: rcvr)).
^0].
^self primitiveFailFor: PrimErrBadIndex].
^self primitiveFailFor: PrimErrBadReceiver!
More information about the Vm-dev
mailing list