56c4f2bfd4
The bulk of this PR is authored by @lightclient , in the original EOF-work. More recently, the code has been picked up and reworked for the new EOF specification, by @MariusVanDerWijden , in https://github.com/ethereum/go-ethereum/pull/29518, and also @shemnon has contributed with fixes. This PR is an attempt to start eating the elephant one small bite at a time, by selecting only the eof-validation as a standalone piece which can be merged without interfering too much in the core stuff. In this PR: - [x] Validation of eof containers, lifted from #29518, along with test-vectors from consensus-tests and fuzzing, to ensure that the move did not lose any functionality. - [x] Definition of eof opcodes, which is a prerequisite for validation - [x] Addition of `undefined` to a jumptable entry item. I'm not super-happy with this, but for the moment it seems the least invasive way to do it. A better way might be to go back and allowing nil-items or nil execute-functions to denote "undefined". - [x] benchmarks of eof validation speed --------- Co-authored-by: lightclient <lightclient@protonmail.com> Co-authored-by: Marius van der Wijden <m.vanderwijden@live.de> Co-authored-by: Danno Ferrin <danno.ferrin@shemnon.com>
99 lines
2.6 KiB
Go
99 lines
2.6 KiB
Go
// Copyright 2024 The go-ethereum Authors
|
|
// This file is part of the go-ethereum library.
|
|
//
|
|
// The go-ethereum library is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU Lesser General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// The go-ethereum library is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU Lesser General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU Lesser General Public License
|
|
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
package vm
|
|
|
|
// eofCodeBitmap collects data locations in code.
|
|
func eofCodeBitmap(code []byte) bitvec {
|
|
// The bitmap is 4 bytes longer than necessary, in case the code
|
|
// ends with a PUSH32, the algorithm will push zeroes onto the
|
|
// bitvector outside the bounds of the actual code.
|
|
bits := make(bitvec, len(code)/8+1+4)
|
|
return eofCodeBitmapInternal(code, bits)
|
|
}
|
|
|
|
// eofCodeBitmapInternal is the internal implementation of codeBitmap for EOF
|
|
// code validation.
|
|
func eofCodeBitmapInternal(code, bits bitvec) bitvec {
|
|
for pc := uint64(0); pc < uint64(len(code)); {
|
|
var (
|
|
op = OpCode(code[pc])
|
|
numbits uint16
|
|
)
|
|
pc++
|
|
|
|
if op == RJUMPV {
|
|
// RJUMPV is unique as it has a variable sized operand.
|
|
// The total size is determined by the count byte which
|
|
// immediate follows RJUMPV. Truncation will be caught
|
|
// in other validation steps -- for now, just return a
|
|
// valid bitmap for as much of the code as is
|
|
// available.
|
|
end := uint64(len(code))
|
|
if pc >= end {
|
|
// Count missing, no more bits to mark.
|
|
return bits
|
|
}
|
|
numbits = uint16(code[pc])*2 + 3
|
|
if pc+uint64(numbits) > end {
|
|
// Jump table is truncated, mark as many bits
|
|
// as possible.
|
|
numbits = uint16(end - pc)
|
|
}
|
|
} else {
|
|
numbits = uint16(Immediates(op))
|
|
if numbits == 0 {
|
|
continue
|
|
}
|
|
}
|
|
|
|
if numbits >= 8 {
|
|
for ; numbits >= 16; numbits -= 16 {
|
|
bits.set16(pc)
|
|
pc += 16
|
|
}
|
|
for ; numbits >= 8; numbits -= 8 {
|
|
bits.set8(pc)
|
|
pc += 8
|
|
}
|
|
}
|
|
switch numbits {
|
|
case 1:
|
|
bits.set1(pc)
|
|
pc += 1
|
|
case 2:
|
|
bits.setN(set2BitsMask, pc)
|
|
pc += 2
|
|
case 3:
|
|
bits.setN(set3BitsMask, pc)
|
|
pc += 3
|
|
case 4:
|
|
bits.setN(set4BitsMask, pc)
|
|
pc += 4
|
|
case 5:
|
|
bits.setN(set5BitsMask, pc)
|
|
pc += 5
|
|
case 6:
|
|
bits.setN(set6BitsMask, pc)
|
|
pc += 6
|
|
case 7:
|
|
bits.setN(set7BitsMask, pc)
|
|
pc += 7
|
|
}
|
|
}
|
|
return bits
|
|
}
|