mirror of https://github.com/ethereum/go-ethereum
core/vm: use uint256 in EVM implementation (#20787)
* core/vm: use fixed uint256 library instead of big * core/vm: remove intpools * core/vm: upgrade uint256, fixes uint256.NewFromBig * core/vm: use uint256.Int by value in Stack * core/vm: upgrade uint256 to v1.0.0 * core/vm: don't preallocate space for 1024 stack items (only 16) Co-authored-by: Martin Holst Swende <martin@swende.se>pull/21192/head
Paweł Bylica
4 years ago
committed by
GitHub
parent
39abd92ca8
commit
cf6674539c
File diff suppressed because it is too large
Load Diff
@ -1,31 +0,0 @@ |
|||||||
// Copyright 2017 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/>.
|
|
||||||
|
|
||||||
// +build VERIFY_EVM_INTEGER_POOL
|
|
||||||
|
|
||||||
package vm |
|
||||||
|
|
||||||
import "fmt" |
|
||||||
|
|
||||||
const verifyPool = true |
|
||||||
|
|
||||||
func verifyIntegerPool(ip *intPool) { |
|
||||||
for i, item := range ip.pool.data { |
|
||||||
if item.Cmp(checkVal) != 0 { |
|
||||||
panic(fmt.Sprintf("%d'th item failed aggressive pool check. Value was modified", i)) |
|
||||||
} |
|
||||||
} |
|
||||||
} |
|
||||||
@ -1,23 +0,0 @@ |
|||||||
// Copyright 2017 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/>.
|
|
||||||
|
|
||||||
// +build !VERIFY_EVM_INTEGER_POOL
|
|
||||||
|
|
||||||
package vm |
|
||||||
|
|
||||||
const verifyPool = false |
|
||||||
|
|
||||||
func verifyIntegerPool(ip *intPool) {} |
|
||||||
@ -1,117 +0,0 @@ |
|||||||
// Copyright 2017 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 |
|
||||||
|
|
||||||
import ( |
|
||||||
"math/big" |
|
||||||
"sync" |
|
||||||
) |
|
||||||
|
|
||||||
var checkVal = big.NewInt(-42) |
|
||||||
|
|
||||||
const poolLimit = 256 |
|
||||||
|
|
||||||
// intPool is a pool of big integers that
|
|
||||||
// can be reused for all big.Int operations.
|
|
||||||
type intPool struct { |
|
||||||
pool *Stack |
|
||||||
} |
|
||||||
|
|
||||||
func newIntPool() *intPool { |
|
||||||
return &intPool{pool: newstack()} |
|
||||||
} |
|
||||||
|
|
||||||
// get retrieves a big int from the pool, allocating one if the pool is empty.
|
|
||||||
// Note, the returned int's value is arbitrary and will not be zeroed!
|
|
||||||
func (p *intPool) get() *big.Int { |
|
||||||
if p.pool.len() > 0 { |
|
||||||
return p.pool.pop() |
|
||||||
} |
|
||||||
return new(big.Int) |
|
||||||
} |
|
||||||
|
|
||||||
// getZero retrieves a big int from the pool, setting it to zero or allocating
|
|
||||||
// a new one if the pool is empty.
|
|
||||||
func (p *intPool) getZero() *big.Int { |
|
||||||
if p.pool.len() > 0 { |
|
||||||
return p.pool.pop().SetUint64(0) |
|
||||||
} |
|
||||||
return new(big.Int) |
|
||||||
} |
|
||||||
|
|
||||||
// putOne returns an allocated big int to the pool to be later reused by get calls.
|
|
||||||
// Note, the values as saved as is; neither put nor get zeroes the ints out!
|
|
||||||
// As opposed to 'put' with variadic args, this method becomes inlined by the
|
|
||||||
// go compiler
|
|
||||||
func (p *intPool) putOne(i *big.Int) { |
|
||||||
if len(p.pool.data) > poolLimit { |
|
||||||
return |
|
||||||
} |
|
||||||
p.pool.push(i) |
|
||||||
} |
|
||||||
|
|
||||||
// put returns an allocated big int to the pool to be later reused by get calls.
|
|
||||||
// Note, the values as saved as is; neither put nor get zeroes the ints out!
|
|
||||||
func (p *intPool) put(is ...*big.Int) { |
|
||||||
if len(p.pool.data) > poolLimit { |
|
||||||
return |
|
||||||
} |
|
||||||
for _, i := range is { |
|
||||||
// verifyPool is a build flag. Pool verification makes sure the integrity
|
|
||||||
// of the integer pool by comparing values to a default value.
|
|
||||||
if verifyPool { |
|
||||||
i.Set(checkVal) |
|
||||||
} |
|
||||||
p.pool.push(i) |
|
||||||
} |
|
||||||
} |
|
||||||
|
|
||||||
// The intPool pool's default capacity
|
|
||||||
const poolDefaultCap = 25 |
|
||||||
|
|
||||||
// intPoolPool manages a pool of intPools.
|
|
||||||
type intPoolPool struct { |
|
||||||
pools []*intPool |
|
||||||
lock sync.Mutex |
|
||||||
} |
|
||||||
|
|
||||||
var poolOfIntPools = &intPoolPool{ |
|
||||||
pools: make([]*intPool, 0, poolDefaultCap), |
|
||||||
} |
|
||||||
|
|
||||||
// get is looking for an available pool to return.
|
|
||||||
func (ipp *intPoolPool) get() *intPool { |
|
||||||
ipp.lock.Lock() |
|
||||||
defer ipp.lock.Unlock() |
|
||||||
|
|
||||||
if len(poolOfIntPools.pools) > 0 { |
|
||||||
ip := ipp.pools[len(ipp.pools)-1] |
|
||||||
ipp.pools = ipp.pools[:len(ipp.pools)-1] |
|
||||||
return ip |
|
||||||
} |
|
||||||
return newIntPool() |
|
||||||
} |
|
||||||
|
|
||||||
// put a pool that has been allocated with get.
|
|
||||||
func (ipp *intPoolPool) put(ip *intPool) { |
|
||||||
ipp.lock.Lock() |
|
||||||
defer ipp.lock.Unlock() |
|
||||||
|
|
||||||
if len(ipp.pools) < cap(ipp.pools) { |
|
||||||
ipp.pools = append(ipp.pools, ip) |
|
||||||
} |
|
||||||
} |
|
||||||
@ -1,55 +0,0 @@ |
|||||||
// Copyright 2018 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 |
|
||||||
|
|
||||||
import ( |
|
||||||
"testing" |
|
||||||
) |
|
||||||
|
|
||||||
func TestIntPoolPoolGet(t *testing.T) { |
|
||||||
poolOfIntPools.pools = make([]*intPool, 0, poolDefaultCap) |
|
||||||
|
|
||||||
nip := poolOfIntPools.get() |
|
||||||
if nip == nil { |
|
||||||
t.Fatalf("Invalid pool allocation") |
|
||||||
} |
|
||||||
} |
|
||||||
|
|
||||||
func TestIntPoolPoolPut(t *testing.T) { |
|
||||||
poolOfIntPools.pools = make([]*intPool, 0, poolDefaultCap) |
|
||||||
|
|
||||||
nip := poolOfIntPools.get() |
|
||||||
if len(poolOfIntPools.pools) != 0 { |
|
||||||
t.Fatalf("Pool got added to list when none should have been") |
|
||||||
} |
|
||||||
|
|
||||||
poolOfIntPools.put(nip) |
|
||||||
if len(poolOfIntPools.pools) == 0 { |
|
||||||
t.Fatalf("Pool did not get added to list when one should have been") |
|
||||||
} |
|
||||||
} |
|
||||||
|
|
||||||
func TestIntPoolPoolReUse(t *testing.T) { |
|
||||||
poolOfIntPools.pools = make([]*intPool, 0, poolDefaultCap) |
|
||||||
nip := poolOfIntPools.get() |
|
||||||
poolOfIntPools.put(nip) |
|
||||||
poolOfIntPools.get() |
|
||||||
|
|
||||||
if len(poolOfIntPools.pools) != 0 { |
|
||||||
t.Fatalf("Invalid number of pools. Got %d, expected %d", len(poolOfIntPools.pools), 0) |
|
||||||
} |
|
||||||
} |
|
||||||
Loading…
Reference in new issue