Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cleanups and improvements #871

Open
wants to merge 3 commits into
base: pharo-12
Choose a base branch
from
Open

Cleanups and improvements #871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1329257
enhancement(interpreter): concentrate access to stack
guillep Nov 19, 2024
64941a4
enhancement(interpreter): simplify access to contexts
guillep Nov 19, 2024
20239eb
enhancement(interpreter): add currentBytecode setter for testing
guillep Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions smalltalksrc/VMMaker/SpurMemoryManager.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7502,6 +7502,13 @@ SpurMemoryManager >> isContextNonImm: oop [
^(self classIndexOf: oop) = ClassMethodContextCompactIndex
]

{ #category : 'object testing' }
SpurMemoryManager >> isContextObject: anOop [

<inline: true>
^(self classIndexOfHeader: (self baseHeader: anOop)) = ClassMethodContextCompactIndex
]

{ #category : 'obj stacks' }
SpurMemoryManager >> isEmptyObjStack: objStack [
objStack = nilObj ifTrue:
Expand Down
83 changes: 44 additions & 39 deletions smalltalksrc/VMMaker/StackInterpreter.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4921,6 +4921,13 @@ StackInterpreter >> currentBytecode [
^ currentBytecode
]

{ #category : 'indexing primitive support' }
StackInterpreter >> currentBytecode: anInteger [

<doNotGenerate>
currentBytecode := anInteger
]

{ #category : 'initialization' }
StackInterpreter >> defaultNumStackPages [
"Return the default number of stack pages allocate at startup.
Expand Down Expand Up @@ -14734,48 +14741,46 @@ StackInterpreter >> specialSelectorNumArgs: index [

{ #category : 'indexing primitive support' }
StackInterpreter >> stObject: array at: index [
"Return what ST would return for <obj> at: index."

| hdr fmt totalLength fixedFields stSize |
<inline: true>
hdr := objectMemory baseHeader: array.
fmt := objectMemory formatOfHeader: hdr.
totalLength := objectMemory lengthOf: array format: fmt.
fixedFields := objectMemory fixedFieldsOf: array format: fmt length: totalLength.
(fmt = objectMemory indexablePointersFormat
and: [objectMemory isContextHeader: hdr])
ifTrue:
[stSize := self stackPointerForMaybeMarriedContext: array.
((self oop: index isGreaterThanOrEqualTo: 1)
and: [(self oop: index isLessThanOrEqualTo: stSize)
and: [self isStillMarriedContext: array]]) ifTrue:
[^self noInlineTemporary: index - 1 in: (self frameOfMarriedContext: array)]]
ifFalse: [stSize := totalLength - fixedFields].
((self oop: index isGreaterThanOrEqualTo: (objectMemory firstValidIndexOfIndexableObject: array withFormat: fmt))
and: [self oop: index isLessThanOrEqualTo: stSize]) ifTrue:
[^self subscript: array with: (index + fixedFields) format: fmt].
self primitiveFailFor: (fmt <= 1 ifTrue: [PrimErrBadReceiver] ifFalse: [PrimErrBadIndex]).
^0
"Return what ST would return for <obj> at: index."

| fmt totalLength fixedFields stSize |
<inline: true>
fmt := objectMemory formatOf: array.
totalLength := objectMemory lengthOf: array format: fmt.
fixedFields := objectMemory fixedFieldsOf: array format: fmt length: totalLength.
(fmt = objectMemory indexablePointersFormat
and: [objectMemory isContextObject: array])
ifTrue:
[stSize := self stackPointerForMaybeMarriedContext: array.
((self oop: index isGreaterThanOrEqualTo: 1)
and: [(self oop: index isLessThanOrEqualTo: stSize)
and: [self isStillMarriedContext: array]]) ifTrue:
[^self noInlineTemporary: index - 1 in: (self frameOfMarriedContext: array)]]
ifFalse: [stSize := totalLength - fixedFields].
((self oop: index isGreaterThanOrEqualTo: (objectMemory firstValidIndexOfIndexableObject: array withFormat: fmt))
and: [self oop: index isLessThanOrEqualTo: stSize]) ifTrue:
[^self subscript: array with: (index + fixedFields) format: fmt].
self primitiveFailFor: (fmt <= 1 ifTrue: [PrimErrBadReceiver] ifFalse: [PrimErrBadIndex]).
^0
]

{ #category : 'indexing primitive support' }
StackInterpreter >> stObject: array at: index put: value [
"Do what ST would return for <obj> at: index put: value."
| hdr fmt totalLength fixedFields stSize |
<inline: true>
hdr := objectMemory baseHeader: array.
(objectMemory isContextHeader: hdr) ifTrue:[
"we have another primitive (contextAt:Put: for contexts"
^self primitiveFailFor: PrimErrBadReceiver].
fmt := objectMemory formatOfHeader: hdr.
totalLength := objectMemory lengthOf: array format: fmt.
fixedFields := objectMemory fixedFieldsOf: array format: fmt length: totalLength.
stSize := totalLength - fixedFields.
((self oop: index isGreaterThanOrEqualTo: (objectMemory firstValidIndexOfIndexableObject: array withFormat: fmt))
and: [self oop: index isLessThanOrEqualTo: stSize])
ifTrue: [self subscript: array with: (index + fixedFields) storing: value format: fmt]
ifFalse: [self primitiveFailFor: (fmt <= 1 ifTrue: [PrimErrBadReceiver] ifFalse: [PrimErrBadIndex])].
^value
"Do what ST would return for <obj> at: index put: value."
| fmt totalLength fixedFields stSize |
<inline: true>
(objectMemory isContextObject: array) ifTrue:[
"we have another primitive (contextAt:Put: for contexts"
^self primitiveFailFor: PrimErrBadReceiver].
fmt := objectMemory formatOf: array.
totalLength := objectMemory lengthOf: array format: fmt.
fixedFields := objectMemory fixedFieldsOf: array format: fmt length: totalLength.
stSize := totalLength - fixedFields.
((self oop: index isGreaterThanOrEqualTo: (objectMemory firstValidIndexOfIndexableObject: array withFormat: fmt))
and: [self oop: index isLessThanOrEqualTo: stSize])
ifTrue: [self subscript: array with: (index + fixedFields) storing: value format: fmt]
ifFalse: [self primitiveFailFor: (fmt <= 1 ifTrue: [PrimErrBadReceiver] ifFalse: [PrimErrBadIndex])].
^value
]

{ #category : 'indexing primitive support' }
Expand Down Expand Up @@ -14805,7 +14810,7 @@ StackInterpreter >> stackFloatValue: offset [
StackInterpreter >> stackIntegerValue: offset [
"In the StackInterpreter stacks grow down."
| integerPointer |
integerPointer := stackPages unsignedLongAt: stackPointer + (offset*objectMemory wordSize).
integerPointer := self stackValue: offset.
^self checkedIntegerValueOf: integerPointer
]

Expand Down