forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-26 14:46:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

common: remove BigTrue

Browse source
This commit is contained in:
Felix Lange 2017-02-22 13:08:13 +01:00
parent a894fe621e
commit d3114f5e3b
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
common/big.go
View file

@ -20,14 +20,13 @@ import "math/big"
// Common big integers often used // Common big integers often used
var ( var (
Big1 = big.NewInt(1) Big1 = big.NewInt(1)
Big2 = big.NewInt(2) Big2 = big.NewInt(2)
Big3 = big.NewInt(3) Big3 = big.NewInt(3)
Big0 = big.NewInt(0) Big0 = big.NewInt(0)
BigTrue = Big1 Big32 = big.NewInt(32)
Big32 = big.NewInt(32) Big256 = big.NewInt(0xff)
Big256 = big.NewInt(0xff) Big257 = big.NewInt(257)
Big257 = big.NewInt(257)
) )
func String2Big(num string) *big.Int { func String2Big(num string) *big.Int {

2
core/vm/instructions.go
View file

@ -505,7 +505,7 @@ func opJump(pc *uint64, evm *EVM, contract *Contract, memory *Memory, stack *Sta
} }
func opJumpi(pc *uint64, evm *EVM, contract *Contract, memory *Memory, stack *Stack) ([]byte, error) { func opJumpi(pc *uint64, evm *EVM, contract *Contract, memory *Memory, stack *Stack) ([]byte, error) {
pos, cond := stack.pop(), stack.pop() pos, cond := stack.pop(), stack.pop()
if cond.Cmp(common.BigTrue) >= 0 { if cond.BitLen() > 0 {
if !contract.jumpdests.has(contract.CodeHash, contract.Code, pos) { if !contract.jumpdests.has(contract.CodeHash, contract.Code, pos) {
nop := contract.GetOp(pos.Uint64()) nop := contract.GetOp(pos.Uint64())
return nil, fmt.Errorf("invalid jump destination (%v) %v", nop, pos) return nil, fmt.Errorf("invalid jump destination (%v) %v", nop, pos)