Skip to content

Commit

Permalink
Fix merge
Browse files Browse the repository at this point in the history
#hasSpurMemoryManagerAPI was removed and had always value true
  • Loading branch information
guillep committed Feb 7, 2023
1 parent 1c3d284 commit c198e29
Showing 1 changed file with 13 additions and 15 deletions.
28 changes: 13 additions & 15 deletions smalltalksrc/VMMaker/StackInterpreter.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -14879,22 +14879,20 @@ StackInterpreter >> subscript: array with: index format: fmt [

<inline: true>
<druidDeferredInline>

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)].
fmt = objectMemory sixtyFourBitIndexableFormat ifTrue:
[^self positive64BitIntegerFor:
(objectMemory fetchLong64: index - 1 ofObject: array)]].
fmt <= objectMemory lastPointerFormat ifTrue: [
^ objectMemory fetchPointer: index - 1 ofObject: array ].
fmt >= objectMemory firstByteFormat ifTrue: [
^ objectMemory integerObjectOf:
(objectMemory fetchByte: index - 1 ofObject: array) ].
fmt >= objectMemory firstShortFormat ifTrue: [
^ objectMemory integerObjectOf:
(objectMemory fetchUnsignedShort16: 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)
^ self positive32BitIntegerFor:
(objectMemory fetchLong32: index - 1 ofObject: array)
]

{ #category : #'indexing primitive support' }
Expand Down

0 comments on commit c198e29

Please sign in to comment.