Skip to content

core/vm: refactor push-functions to use min builtin #29515

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

Merged
merged 5 commits into from
Apr 16, 2024
Merged

core/vm: refactor push-functions to use min builtin #29515

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
06ba0c9
optimize-push
Apr 12, 2024
fc8c27a
revert push1 change
Apr 12, 2024
5b48bdd
Update instructions.go
fjl Apr 15, 2024
7e2b22e
core/vm: go format
holiman Apr 16, 2024
ab95fd2
core/vm: fix nit
karalabe Apr 16, 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
27 changes: 11 additions & 16 deletions core/vm/instructions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -889,22 +889,17 @@ func opPush1(pc *uint64, interpreter *EVMInterpreter, scope *ScopeContext) ([]by
// make push instruction function
func makePush(size uint64, pushByteSize int) executionFunc {
return func(pc *uint64, interpreter *EVMInterpreter, scope *ScopeContext) ([]byte, error) {
codeLen := len(scope.Contract.Code)

startMin := codeLen
if int(*pc+1) < startMin {
startMin = int(*pc + 1)
}

endMin := codeLen
if startMin+pushByteSize < endMin {
endMin = startMin + pushByteSize
}

integer := new(uint256.Int)
scope.Stack.push(integer.SetBytes(common.RightPadBytes(
scope.Contract.Code[startMin:endMin], pushByteSize)))

var (
codeLen = len(scope.Contract.Code)
start = min(codeLen, int(*pc+1))
end = min(codeLen, start+pushByteSize)
)
scope.Stack.push(new(uint256.Int).SetBytes(
common.RightPadBytes(
scope.Contract.Code[start:end],
pushByteSize,
)),
)
*pc += size
return nil, nil
}
Expand Down