aboutsummaryrefslogtreecommitdiffstats
path: root/vm
diff options
context:
space:
mode:
Diffstat (limited to 'vm')
-rw-r--r--vm/address.go8
-rw-r--r--vm/analysis.go10
-rw-r--r--vm/closure.go72
-rw-r--r--vm/environment.go37
-rw-r--r--vm/execution.go95
-rw-r--r--vm/stack.go3
-rw-r--r--vm/types.go13
-rw-r--r--vm/virtual_machine.go4
-rw-r--r--vm/vm.go690
-rw-r--r--vm/vm_debug.go160
10 files changed, 169 insertions, 923 deletions
diff --git a/vm/address.go b/vm/address.go
index 235143b34..06bd35f6b 100644
--- a/vm/address.go
+++ b/vm/address.go
@@ -31,12 +31,16 @@ func sha256Func(in []byte) []byte {
}
func ripemd160Func(in []byte) []byte {
- return ethutil.RightPadBytes(crypto.Ripemd160(in), 32)
+ return ethutil.LeftPadBytes(crypto.Ripemd160(in), 32)
}
func ecrecoverFunc(in []byte) []byte {
// In case of an invalid sig. Defaults to return nil
defer func() { recover() }()
- return crypto.Ecrecover(in)
+ hash := in[:32]
+ v := ethutil.BigD(in[32:64]).Bytes()[0] - 27
+ sig := append(in[64:], v)
+
+ return ethutil.LeftPadBytes(crypto.Sha3(crypto.Ecrecover(append(hash, sig...))[1:])[12:], 32)
}
diff --git a/vm/analysis.go b/vm/analysis.go
index 52c7143e0..fef448b7b 100644
--- a/vm/analysis.go
+++ b/vm/analysis.go
@@ -6,17 +6,17 @@ import (
"github.com/ethereum/go-ethereum/ethutil"
)
-func analyseJumpDests(code []byte) (dests map[int64]*big.Int) {
- dests = make(map[int64]*big.Int)
+func analyseJumpDests(code []byte) (dests map[uint64]*big.Int) {
+ dests = make(map[uint64]*big.Int)
lp := false
var lpv *big.Int
- for pc := int64(0); pc < int64(len(code)); pc++ {
+ for pc := uint64(0); pc < uint64(len(code)); pc++ {
var op OpCode = OpCode(code[pc])
switch op {
case PUSH1, PUSH2, PUSH3, PUSH4, PUSH5, PUSH6, PUSH7, PUSH8, PUSH9, PUSH10, PUSH11, PUSH12, PUSH13, PUSH14, PUSH15, PUSH16, PUSH17, PUSH18, PUSH19, PUSH20, PUSH21, PUSH22, PUSH23, PUSH24, PUSH25, PUSH26, PUSH27, PUSH28, PUSH29, PUSH30, PUSH31, PUSH32:
- a := int64(op) - int64(PUSH1) + 1
- if int64(len(code)) > pc+1+a {
+ a := uint64(op) - uint64(PUSH1) + 1
+ if uint64(len(code)) > pc+1+a {
lpv = ethutil.BigD(code[pc+1 : pc+1+a])
}
diff --git a/vm/closure.go b/vm/closure.go
index ef9bbca93..bd5268f96 100644
--- a/vm/closure.go
+++ b/vm/closure.go
@@ -1,7 +1,5 @@
package vm
-// TODO Re write VM to use values instead of big integers?
-
import (
"math/big"
@@ -12,18 +10,16 @@ import (
type ClosureRef interface {
ReturnGas(*big.Int, *big.Int)
Address() []byte
- Object() *state.StateObject
+ SetCode([]byte)
GetStorage(*big.Int) *ethutil.Value
SetStorage(*big.Int, *ethutil.Value)
}
-// Basic inline closure object which implement the 'closure' interface
type Closure struct {
caller ClosureRef
- object *state.StateObject
+ object ClosureRef
Code []byte
message *state.Message
- exe *Execution
Gas, UsedGas, Price *big.Int
@@ -31,7 +27,7 @@ type Closure struct {
}
// Create a new closure for the given data items
-func NewClosure(msg *state.Message, caller ClosureRef, object *state.StateObject, code []byte, gas, price *big.Int) *Closure {
+func NewClosure(msg *state.Message, caller ClosureRef, object ClosureRef, code []byte, gas, price *big.Int) *Closure {
c := &Closure{message: msg, caller: caller, object: object, Code: code, Args: nil}
// Gas should be a pointer so it can safely be reduced through the run
@@ -45,26 +41,16 @@ func NewClosure(msg *state.Message, caller ClosureRef, object *state.StateObject
return c
}
-// Retuns the x element in data slice
-func (c *Closure) GetStorage(x *big.Int) *ethutil.Value {
- m := c.object.GetStorage(x)
- if m == nil {
- return ethutil.EmptyValue()
- }
-
- return m
-}
-
-func (c *Closure) Get(x *big.Int) *ethutil.Value {
- return c.Gets(x, big.NewInt(1))
+func (c *Closure) GetValue(x uint64) *ethutil.Value {
+ return c.GetRangeValue(x, 1)
}
-func (c *Closure) GetOp(x int) OpCode {
+func (c *Closure) GetOp(x uint64) OpCode {
return OpCode(c.GetByte(x))
}
-func (c *Closure) GetByte(x int) byte {
- if x < len(c.Code) {
+func (c *Closure) GetByte(x uint64) byte {
+ if x < uint64(len(c.Code)) {
return c.Code[x]
}
@@ -79,30 +65,30 @@ func (c *Closure) GetBytes(x, y int) []byte {
return c.Code[x : x+y]
}
-func (c *Closure) Gets(x, y *big.Int) *ethutil.Value {
- if x.Int64() >= int64(len(c.Code)) || y.Int64() >= int64(len(c.Code)) {
+func (c *Closure) GetRangeValue(x, y uint64) *ethutil.Value {
+ if x >= uint64(len(c.Code)) || y >= uint64(len(c.Code)) {
return ethutil.NewValue(0)
}
- partial := c.Code[x.Int64() : x.Int64()+y.Int64()]
+ partial := c.Code[x : x+y]
return ethutil.NewValue(partial)
}
+/*
+ * State storage functions
+ */
func (c *Closure) SetStorage(x *big.Int, val *ethutil.Value) {
c.object.SetStorage(x, val)
}
-func (c *Closure) Address() []byte {
- return c.object.Address()
-}
-
-func (c *Closure) Call(vm VirtualMachine, args []byte) ([]byte, *big.Int, error) {
- c.Args = args
-
- ret, err := vm.RunClosure(c)
+func (c *Closure) GetStorage(x *big.Int) *ethutil.Value {
+ m := c.object.GetStorage(x)
+ if m == nil {
+ return ethutil.EmptyValue()
+ }
- return ret, c.UsedGas, err
+ return m
}
func (c *Closure) Return(ret []byte) []byte {
@@ -112,6 +98,9 @@ func (c *Closure) Return(ret []byte) []byte {
return ret
}
+/*
+ * Gas functions
+ */
func (c *Closure) UseGas(gas *big.Int) bool {
if c.Gas.Cmp(gas) < 0 {
return false
@@ -131,14 +120,17 @@ func (c *Closure) ReturnGas(gas, price *big.Int) {
c.UsedGas.Sub(c.UsedGas, gas)
}
-func (c *Closure) Object() *state.StateObject {
- return c.object
-}
-
+/*
+ * Set / Get
+ */
func (c *Closure) Caller() ClosureRef {
return c.caller
}
-func (self *Closure) SetExecution(exe *Execution) {
- self.exe = exe
+func (c *Closure) Address() []byte {
+ return c.object.Address()
+}
+
+func (self *Closure) SetCode(code []byte) {
+ self.Code = code
}
diff --git a/vm/environment.go b/vm/environment.go
index 5604989e1..d77fb1419 100644
--- a/vm/environment.go
+++ b/vm/environment.go
@@ -9,7 +9,7 @@ import (
)
type Environment interface {
- State() *state.State
+ State() *state.StateDB
Origin() []byte
BlockNumber() *big.Int
@@ -20,7 +20,14 @@ type Environment interface {
BlockHash() []byte
GasLimit() *big.Int
Transfer(from, to Account, amount *big.Int) error
- AddLog(*state.Log)
+ AddLog(state.Log)
+
+ Depth() int
+ SetDepth(i int)
+
+ Call(me ClosureRef, addr, data []byte, gas, price, value *big.Int) ([]byte, error)
+ CallCode(me ClosureRef, addr, data []byte, gas, price, value *big.Int) ([]byte, error)
+ Create(me ClosureRef, addr, data []byte, gas, price, value *big.Int) ([]byte, error, ClosureRef)
}
type Object interface {
@@ -43,9 +50,27 @@ func Transfer(from, to Account, amount *big.Int) error {
from.SubBalance(amount)
to.AddBalance(amount)
- // Add default LOG. Default = big(sender.addr) + 1
- //addr := ethutil.BigD(receiver.Address())
- //tx.addLog(vm.Log{sender.Address(), [][]byte{ethutil.U256(addr.Add(addr, ethutil.Big1)).Bytes()}, nil})
-
return nil
}
+
+type Log struct {
+ address []byte
+ topics [][]byte
+ data []byte
+}
+
+func (self *Log) Address() []byte {
+ return self.address
+}
+
+func (self *Log) Topics() [][]byte {
+ return self.topics
+}
+
+func (self *Log) Data() []byte {
+ return self.data
+}
+
+func (self *Log) RlpData() interface{} {
+ return []interface{}{self.address, ethutil.ByteSliceToInterface(self.topics), self.data}
+}
diff --git a/vm/execution.go b/vm/execution.go
deleted file mode 100644
index c23164f82..000000000
--- a/vm/execution.go
+++ /dev/null
@@ -1,95 +0,0 @@
-package vm
-
-import (
- "fmt"
- "math/big"
-
- "github.com/ethereum/go-ethereum/ethutil"
- "github.com/ethereum/go-ethereum/state"
-)
-
-type Execution struct {
- vm VirtualMachine
- address, input []byte
- Gas, price, value *big.Int
- object *state.StateObject
- SkipTransfer bool
-}
-
-func NewExecution(vm VirtualMachine, address, input []byte, gas, gasPrice, value *big.Int) *Execution {
- return &Execution{vm: vm, address: address, input: input, Gas: gas, price: gasPrice, value: value}
-}
-
-func (self *Execution) Addr() []byte {
- return self.address
-}
-
-func (self *Execution) Exec(codeAddr []byte, caller ClosureRef) ([]byte, error) {
- // Retrieve the executing code
- code := self.vm.Env().State().GetCode(codeAddr)
-
- return self.exec(code, codeAddr, caller)
-}
-
-func (self *Execution) exec(code, caddr []byte, caller ClosureRef) (ret []byte, err error) {
- env := self.vm.Env()
-
- vmlogger.Debugf("pre state %x\n", env.State().Root())
- snapshot := env.State().Copy()
- defer func() {
- if IsDepthErr(err) || IsOOGErr(err) {
- env.State().Set(snapshot)
- }
- vmlogger.Debugf("post state %x\n", env.State().Root())
- }()
-
- msg := env.State().Manifest().AddMessage(&state.Message{
- To: self.address, From: caller.Address(),
- Input: self.input,
- Origin: env.Origin(),
- Block: env.BlockHash(), Timestamp: env.Time(), Coinbase: env.Coinbase(), Number: env.BlockNumber(),
- Value: self.value,
- })
-
- from, to := caller.Object(), env.State().GetOrNewStateObject(self.address)
- // Skipping transfer is used on testing for the initial call
- if !self.SkipTransfer {
- err = env.Transfer(from, to, self.value)
- }
-
- if err != nil {
- caller.ReturnGas(self.Gas, self.price)
-
- err = fmt.Errorf("Insufficient funds to transfer value. Req %v, has %v", self.value, from.Balance)
- } else {
- self.object = to
- // Pre-compiled contracts (address.go) 1, 2 & 3.
- naddr := ethutil.BigD(caddr).Uint64()
- if p := Precompiled[naddr]; p != nil {
- if self.Gas.Cmp(p.Gas) >= 0 {
- ret = p.Call(self.input)
- self.vm.Printf("NATIVE_FUNC(%x) => %x", naddr, ret)
- }
- } else {
- // Create a new callable closure
- c := NewClosure(msg, caller, to, code, self.Gas, self.price)
- c.exe = self
-
- if self.vm.Depth() == MaxCallDepth {
- c.UseGas(self.Gas)
-
- return c.Return(nil), DepthError{}
- }
-
- // Executer the closure and get the return value (if any)
- ret, _, err = c.Call(self.vm, self.input)
- msg.Output = ret
- }
- }
-
- return
-}
-
-func (self *Execution) Create(caller ClosureRef) (ret []byte, err error) {
- return self.exec(self.input, nil, caller)
-}
diff --git a/vm/stack.go b/vm/stack.go
index 2eca60ad1..98795cc03 100644
--- a/vm/stack.go
+++ b/vm/stack.go
@@ -147,9 +147,8 @@ func (m *Memory) Get(offset, size int64) []byte {
func (self *Memory) Geti(offset, size int64) (cpy []byte) {
if len(self.store) > int(offset) {
- s := int64(math.Min(float64(len(self.store)), float64(offset+size)))
cpy = make([]byte, size)
- copy(cpy, self.store[offset:offset+s])
+ copy(cpy, self.store[offset:offset+size])
return
}
diff --git a/vm/types.go b/vm/types.go
index 0b20fb655..ec9c7e74e 100644
--- a/vm/types.go
+++ b/vm/types.go
@@ -163,8 +163,8 @@ const (
// 0xf0 range - closures
CREATE OpCode = 0xf0 + iota
CALL
- RETURN
CALLCODE
+ RETURN
// 0x70 range - other
SUICIDE = 0xff
@@ -308,12 +308,11 @@ var opCodeToString = map[OpCode]string{
SWAP14: "SWAP14",
SWAP15: "SWAP15",
SWAP16: "SWAP16",
-
- LOG0: "LOG0",
- LOG1: "LOG1",
- LOG2: "LOG2",
- LOG3: "LOG3",
- LOG4: "LOG4",
+ LOG0: "LOG0",
+ LOG1: "LOG1",
+ LOG2: "LOG2",
+ LOG3: "LOG3",
+ LOG4: "LOG4",
// 0xf0 range
CREATE: "CREATE",
diff --git a/vm/virtual_machine.go b/vm/virtual_machine.go
index cc8cd39a9..5738075fb 100644
--- a/vm/virtual_machine.go
+++ b/vm/virtual_machine.go
@@ -1,8 +1,10 @@
package vm
+import "math/big"
+
type VirtualMachine interface {
Env() Environment
- RunClosure(*Closure) ([]byte, error)
+ Run(me, caller ClosureRef, code []byte, value, gas, price *big.Int, data []byte) ([]byte, error)
Depth() int
Printf(string, ...interface{}) VirtualMachine
Endl() VirtualMachine
diff --git a/vm/vm.go b/vm/vm.go
index e1c2d9c14..968ca10fa 100644
--- a/vm/vm.go
+++ b/vm/vm.go
@@ -1,12 +1,6 @@
package vm
-import (
- "fmt"
- "math/big"
-
- "github.com/ethereum/go-ethereum/crypto"
- "github.com/ethereum/go-ethereum/ethutil"
-)
+import "math/big"
// BIG FAT WARNING. THIS VM IS NOT YET IS USE!
// I want to get all VM tests pass first before updating this VM
@@ -26,686 +20,8 @@ func New(env Environment, typ Type) VirtualMachine {
}
}
-func (self *Vm) RunClosure(closure *Closure) (ret []byte, err error) {
- self.depth++
-
- // Recover from any require exception
- defer func() {
- if r := recover(); r != nil {
- ret = closure.Return(nil)
- err = fmt.Errorf("%v", r)
- }
- }()
-
- // Don't bother with the execution if there's no code.
- if len(closure.Code) == 0 {
- return closure.Return(nil), nil
- }
-
- var (
- op OpCode
-
- mem = &Memory{}
- stack = NewStack()
- pc = 0
- step = 0
- require = func(m int) {
- if stack.Len() < m {
- panic(fmt.Sprintf("%04v (%v) stack err size = %d, required = %d", pc, op, stack.Len(), m))
- }
- }
- )
-
- for {
- // The base for all big integer arithmetic
- base := new(big.Int)
-
- step++
- // Get the memory location of pc
- op := closure.GetOp(pc)
-
- gas := new(big.Int)
- addStepGasUsage := func(amount *big.Int) {
- gas.Add(gas, amount)
- }
-
- addStepGasUsage(GasStep)
-
- var newMemSize *big.Int = ethutil.Big0
- switch op {
- case STOP:
- gas.Set(ethutil.Big0)
- case SUICIDE:
- gas.Set(ethutil.Big0)
- case SLOAD:
- gas.Set(GasSLoad)
- case SSTORE:
- var mult *big.Int
- y, x := stack.Peekn()
- val := closure.GetStorage(x)
- if val.BigInt().Cmp(ethutil.Big0) == 0 && len(y.Bytes()) > 0 {
- mult = ethutil.Big2
- } else if val.BigInt().Cmp(ethutil.Big0) != 0 && len(y.Bytes()) == 0 {
- mult = ethutil.Big0
- } else {
- mult = ethutil.Big1
- }
- gas = new(big.Int).Mul(mult, GasSStore)
- case BALANCE:
- gas.Set(GasBalance)
- case MSTORE:
- require(2)
- newMemSize = calcMemSize(stack.Peek(), u256(32))
- case MLOAD:
- require(1)
-
- newMemSize = calcMemSize(stack.Peek(), u256(32))
- case MSTORE8:
- require(2)
- newMemSize = calcMemSize(stack.Peek(), u256(1))
- case RETURN:
- require(2)
-
- newMemSize = calcMemSize(stack.Peek(), stack.data[stack.Len()-2])
- case SHA3:
- require(2)
-
- gas.Set(GasSha)
-
- newMemSize = calcMemSize(stack.Peek(), stack.data[stack.Len()-2])
- case CALLDATACOPY:
- require(2)
-
- newMemSize = calcMemSize(stack.Peek(), stack.data[stack.Len()-3])
- case CODECOPY:
- require(3)
-
- newMemSize = calcMemSize(stack.Peek(), stack.data[stack.Len()-3])
- case EXTCODECOPY:
- require(4)
-
- newMemSize = calcMemSize(stack.data[stack.Len()-2], stack.data[stack.Len()-4])
- case CALL, CALLCODE:
- require(7)
- gas.Set(GasCall)
- addStepGasUsage(stack.data[stack.Len()-1])
-
- x := calcMemSize(stack.data[stack.Len()-6], stack.data[stack.Len()-7])
- y := calcMemSize(stack.data[stack.Len()-4], stack.data[stack.Len()-5])
-
- newMemSize = ethutil.BigMax(x, y)
- case CREATE:
- require(3)
- gas.Set(GasCreate)
-
- newMemSize = calcMemSize(stack.data[stack.Len()-2], stack.data[stack.Len()-3])
- }
-
- if newMemSize.Cmp(ethutil.Big0) > 0 {
- newMemSize.Add(newMemSize, u256(31))
- newMemSize.Div(newMemSize, u256(32))
- newMemSize.Mul(newMemSize, u256(32))
-
- if newMemSize.Cmp(u256(int64(mem.Len()))) > 0 {
- memGasUsage := new(big.Int).Sub(newMemSize, u256(int64(mem.Len())))
- memGasUsage.Mul(GasMemory, memGasUsage)
- memGasUsage.Div(memGasUsage, u256(32))
-
- addStepGasUsage(memGasUsage)
- }
- }
-
- if !closure.UseGas(gas) {
- err := fmt.Errorf("Insufficient gas for %v. req %v has %v", op, gas, closure.Gas)
-
- closure.UseGas(closure.Gas)
-
- return closure.Return(nil), err
- }
-
- mem.Resize(newMemSize.Uint64())
-
- switch op {
- // 0x20 range
- case ADD:
- require(2)
- x, y := stack.Popn()
-
- base.Add(y, x)
-
- U256(base)
-
- // Pop result back on the stack
- stack.Push(base)
- case SUB:
- require(2)
- x, y := stack.Popn()
-
- base.Sub(y, x)
-
- U256(base)
-
- // Pop result back on the stack
- stack.Push(base)
- case MUL:
- require(2)
- x, y := stack.Popn()
-
- base.Mul(y, x)
-
- U256(base)
-
- // Pop result back on the stack
- stack.Push(base)
- case DIV:
- require(2)
- x, y := stack.Popn()
-
- if x.Cmp(ethutil.Big0) != 0 {
- base.Div(y, x)
- }
-
- U256(base)
-
- // Pop result back on the stack
- stack.Push(base)
- case SDIV:
- require(2)
- y, x := S256(stack.Pop()), S256(stack.Pop())
-
- if x.Cmp(ethutil.Big0) == 0 {
- base.Set(ethutil.Big0)
- } else {
- n := new(big.Int)
- if new(big.Int).Mul(y, x).Cmp(ethutil.Big0) < 0 {
- n.SetInt64(-1)
- } else {
- n.SetInt64(1)
- }
-
- base.Div(y.Abs(y), x.Mul(x.Abs(x), n))
-
- U256(base)
- }
-
- stack.Push(base)
- case MOD:
- require(2)
- x, y := stack.Popn()
-
- base.Mod(y, x)
-
- U256(base)
-
- stack.Push(base)
- case SMOD:
- require(2)
- y, x := S256(stack.Pop()), S256(stack.Pop())
-
- if x.Cmp(ethutil.Big0) == 0 {
- base.Set(ethutil.Big0)
- } else {
- n := new(big.Int)
- if y.Cmp(ethutil.Big0) < 0 {
- n.SetInt64(-1)
- } else {
- n.SetInt64(1)
- }
-
- base.Mod(y.Abs(y), x.Mul(x.Abs(x), n))
-
- U256(base)
- }
-
- stack.Push(base)
-
- case EXP:
- require(2)
- x, y := stack.Popn()
-
- base.Exp(y, x, Pow256)
-
- U256(base)
-
- stack.Push(base)
- case NOT:
- require(1)
- base.Sub(Pow256, stack.Pop())
-
- base = U256(base)
-
- stack.Push(base)
- case LT:
- require(2)
- x, y := stack.Popn()
- // x < y
- if y.Cmp(x) < 0 {
- stack.Push(ethutil.BigTrue)
- } else {
- stack.Push(ethutil.BigFalse)
- }
- case GT:
- require(2)
- x, y := stack.Popn()
-
- // x > y
- if y.Cmp(x) > 0 {
- stack.Push(ethutil.BigTrue)
- } else {
- stack.Push(ethutil.BigFalse)
- }
-
- case SLT:
- require(2)
- y, x := S256(stack.Pop()), S256(stack.Pop())
- // x < y
- if y.Cmp(S256(x)) < 0 {
- stack.Push(ethutil.BigTrue)
- } else {
- stack.Push(ethutil.BigFalse)
- }
- case SGT:
- require(2)
- y, x := S256(stack.Pop()), S256(stack.Pop())
-
- // x > y
- if y.Cmp(x) > 0 {
- stack.Push(ethutil.BigTrue)
- } else {
- stack.Push(ethutil.BigFalse)
- }
-
- case EQ:
- require(2)
- x, y := stack.Popn()
-
- // x == y
- if x.Cmp(y) == 0 {
- stack.Push(ethutil.BigTrue)
- } else {
- stack.Push(ethutil.BigFalse)
- }
- case ISZERO:
- require(1)
- x := stack.Pop()
- if x.Cmp(ethutil.BigFalse) > 0 {
- stack.Push(ethutil.BigFalse)
- } else {
- stack.Push(ethutil.BigTrue)
- }
-
- // 0x10 range
- case AND:
- require(2)
- x, y := stack.Popn()
-
- stack.Push(base.And(y, x))
- case OR:
- require(2)
- x, y := stack.Popn()
-
- stack.Push(base.Or(y, x))
- case XOR:
- require(2)
- x, y := stack.Popn()
-
- stack.Push(base.Xor(y, x))
- case BYTE:
- require(2)
- val, th := stack.Popn()
- if th.Cmp(big.NewInt(32)) < 0 && th.Cmp(big.NewInt(int64(len(val.Bytes())))) < 0 {
- byt := big.NewInt(int64(ethutil.LeftPadBytes(val.Bytes(), 32)[th.Int64()]))
- stack.Push(byt)
-
- } else {
- stack.Push(ethutil.BigFalse)
- }
- case ADDMOD:
- require(3)
-
- x := stack.Pop()
- y := stack.Pop()
- z := stack.Pop()
-
- base.Add(x, y)
- base.Mod(base, z)
-
- U256(base)
-
- stack.Push(base)
- case MULMOD:
- require(3)
-
- x := stack.Pop()
- y := stack.Pop()
- z := stack.Pop()
-
- base.Mul(x, y)
- base.Mod(base, z)
-
- U256(base)
-
- stack.Push(base)
-
- // 0x20 range
- case SHA3:
- require(2)
- size, offset := stack.Popn()
- data := crypto.Sha3(mem.Get(offset.Int64(), size.Int64()))
-
- stack.Push(ethutil.BigD(data))
-
- // 0x30 range
- case ADDRESS:
- stack.Push(ethutil.BigD(closure.Address()))
-
- case BALANCE:
- require(1)
-
- addr := stack.Pop().Bytes()
- balance := self.env.State().GetBalance(addr)
-
- stack.Push(balance)
-
- case ORIGIN:
- origin := self.env.Origin()
-
- stack.Push(ethutil.BigD(origin))
-
- case CALLER:
- caller := closure.caller.Address()
- stack.Push(ethutil.BigD(caller))
-
- case CALLVALUE:
- value := closure.exe.value
-
- stack.Push(value)
-
- case CALLDATALOAD:
- require(1)
- var (
- offset = stack.Pop()
- data = make([]byte, 32)
- lenData = big.NewInt(int64(len(closure.Args)))
- )
-
- if lenData.Cmp(offset) >= 0 {
- length := new(big.Int).Add(offset, ethutil.Big32)
- length = ethutil.BigMin(length, lenData)
-
- copy(data, closure.Args[offset.Int64():length.Int64()])
- }
-
- stack.Push(ethutil.BigD(data))
- case CALLDATASIZE:
- l := int64(len(closure.Args))
- stack.Push(big.NewInt(l))
-
- case CALLDATACOPY:
- var (
- size = int64(len(closure.Args))
- mOff = stack.Pop().Int64()
- cOff = stack.Pop().Int64()
- l = stack.Pop().Int64()
- )
-
- if cOff > size {
- cOff = 0
- l = 0
- } else if cOff+l > size {
- l = 0
- }
-
- code := closure.Args[cOff : cOff+l]
-
- mem.Set(mOff, l, code)
- case CODESIZE, EXTCODESIZE:
- var code []byte
- if op == EXTCODECOPY {
- addr := stack.Pop().Bytes()
-
- code = self.env.State().GetCode(addr)
- } else {
- code = closure.Code
- }
-
- l := big.NewInt(int64(len(code)))
- stack.Push(l)
-
- case CODECOPY, EXTCODECOPY:
- var code []byte
- if op == EXTCODECOPY {
- addr := stack.Pop().Bytes()
-
- code = self.env.State().GetCode(addr)
- } else {
- code = closure.Code
- }
-
- var (
- size = int64(len(code))
- mOff = stack.Pop().Int64()
- cOff = stack.Pop().Int64()
- l = stack.Pop().Int64()
- )
-
- if cOff > size {
- cOff = 0
- l = 0
- } else if cOff+l > size {
- l = 0
- }
-
- codeCopy := code[cOff : cOff+l]
-
- mem.Set(mOff, l, codeCopy)
- case GASPRICE:
- stack.Push(closure.Price)
-
- // 0x40 range
- case PREVHASH:
- prevHash := self.env.PrevHash()
-
- stack.Push(ethutil.BigD(prevHash))
-
- case COINBASE:
- coinbase := self.env.Coinbase()
-
- stack.Push(ethutil.BigD(coinbase))
-
- case TIMESTAMP:
- time := self.env.Time()
-
- stack.Push(big.NewInt(time))
-
- case NUMBER:
- number := self.env.BlockNumber()
-
- stack.Push(number)
-
- case DIFFICULTY:
- difficulty := self.env.Difficulty()
-
- stack.Push(difficulty)
-
- case GASLIMIT:
- // TODO
- stack.Push(big.NewInt(0))
-
- // 0x50 range
- case PUSH1, PUSH2, PUSH3, PUSH4, PUSH5, PUSH6, PUSH7, PUSH8, PUSH9, PUSH10, PUSH11, PUSH12, PUSH13, PUSH14, PUSH15, PUSH16, PUSH17, PUSH18, PUSH19, PUSH20, PUSH21, PUSH22, PUSH23, PUSH24, PUSH25, PUSH26, PUSH27, PUSH28, PUSH29, PUSH30, PUSH31, PUSH32:
- a := int(op - PUSH1 + 1)
- val := ethutil.BigD(closure.GetBytes(int(pc+1), a))
- // Push value to stack
- stack.Push(val)
-
- pc += a
-
- step += int(op) - int(PUSH1) + 1
- case POP:
- require(1)
- stack.Pop()
- case DUP1, DUP2, DUP3, DUP4, DUP5, DUP6, DUP7, DUP8, DUP9, DUP10, DUP11, DUP12, DUP13, DUP14, DUP15, DUP16:
- n := int(op - DUP1 + 1)
- stack.Dupn(n)
- case SWAP1, SWAP2, SWAP3, SWAP4, SWAP5, SWAP6, SWAP7, SWAP8, SWAP9, SWAP10, SWAP11, SWAP12, SWAP13, SWAP14, SWAP15, SWAP16:
- n := int(op - SWAP1 + 2)
- stack.Swapn(n)
-
- case MLOAD:
- require(1)
- offset := stack.Pop()
- val := ethutil.BigD(mem.Get(offset.Int64(), 32))
- stack.Push(val)
-
- case MSTORE: // Store the value at stack top-1 in to memory at location stack top
- require(2)
- // Pop value of the stack
- val, mStart := stack.Popn()
- mem.Set(mStart.Int64(), 32, ethutil.BigToBytes(val, 256))
-
- case MSTORE8:
- require(2)
- off := stack.Pop()
- val := stack.Pop()
-
- mem.store[off.Int64()] = byte(val.Int64() & 0xff)
-
- case SLOAD:
- require(1)
- loc := stack.Pop()
- val := closure.GetStorage(loc)
-
- stack.Push(val.BigInt())
-
- case SSTORE:
- require(2)
- val, loc := stack.Popn()
- closure.SetStorage(loc, ethutil.NewValue(val))
-
- closure.message.AddStorageChange(loc.Bytes())
-
- case JUMP:
- require(1)
- pc = int(stack.Pop().Int64())
- // Reduce pc by one because of the increment that's at the end of this for loop
-
- continue
- case JUMPI:
- require(2)
- cond, pos := stack.Popn()
- if cond.Cmp(ethutil.BigTrue) >= 0 {
- pc = int(pos.Int64())
-
- if closure.GetOp(int(pc)) != JUMPDEST {
- return closure.Return(nil), fmt.Errorf("JUMP missed JUMPDEST %v", pc)
- }
-
- continue
- }
- case JUMPDEST:
- case PC:
- stack.Push(u256(int64(pc)))
- case MSIZE:
- stack.Push(big.NewInt(int64(mem.Len())))
- case GAS:
- stack.Push(closure.Gas)
- // 0x60 range
- case CREATE:
- require(3)
-
- var (
- err error
- value = stack.Pop()
- size, offset = stack.Popn()
- input = mem.Get(offset.Int64(), size.Int64())
- gas = new(big.Int).Set(closure.Gas)
-
- // Snapshot the current stack so we are able to
- // revert back to it later.
- //snapshot = self.env.State().Copy()
- )
-
- // Generate a new address
- addr := crypto.CreateAddress(closure.Address(), closure.object.Nonce)
- closure.object.Nonce++
-
- closure.UseGas(closure.Gas)
-
- msg := NewExecution(self, addr, input, gas, closure.Price, value)
- ret, err := msg.Exec(addr, closure)
- if err != nil {
- stack.Push(ethutil.BigFalse)
-
- // Revert the state as it was before.
- //self.env.State().Set(snapshot)
-
- } else {
- msg.object.Code = ret
-
- stack.Push(ethutil.BigD(addr))
- }
-
- case CALL, CALLCODE:
- require(7)
-
- gas := stack.Pop()
- // Pop gas and value of the stack.
- value, addr := stack.Popn()
- // Pop input size and offset
- inSize, inOffset := stack.Popn()
- // Pop return size and offset
- retSize, retOffset := stack.Popn()
-
- // Get the arguments from the memory
- args := mem.Get(inOffset.Int64(), inSize.Int64())
-
- var executeAddr []byte
- if op == CALLCODE {
- executeAddr = closure.Address()
- } else {
- executeAddr = addr.Bytes()
- }
-
- msg := NewExecution(self, executeAddr, args, gas, closure.Price, value)
- ret, err := msg.Exec(addr.Bytes(), closure)
- if err != nil {
- stack.Push(ethutil.BigFalse)
- } else {
- stack.Push(ethutil.BigTrue)
-
- mem.Set(retOffset.Int64(), retSize.Int64(), ret)
- }
-
- case RETURN:
- require(2)
- size, offset := stack.Popn()
- ret := mem.Get(offset.Int64(), size.Int64())
-
- return closure.Return(ret), nil
- case SUICIDE:
- require(1)
-
- receiver := self.env.State().GetOrNewStateObject(stack.Pop().Bytes())
-
- receiver.AddAmount(closure.object.Balance())
-
- closure.object.MarkForDeletion()
-
- fallthrough
- case STOP: // Stop the closure
-
- return closure.Return(nil), nil
- default:
- vmlogger.Debugf("(pc) %-3v Invalid opcode %x\n", pc, op)
-
- //panic(fmt.Sprintf("Invalid opcode %x", op))
-
- return closure.Return(nil), fmt.Errorf("Invalid opcode %x", op)
- }
-
- pc++
- }
+func (self *Vm) Run(me, caller ClosureRef, code []byte, value, gas, price *big.Int, data []byte) (ret []byte, err error) {
+ return nil, nil
}
func (self *Vm) Env() Environment {
diff --git a/vm/vm_debug.go b/vm/vm_debug.go
index 544e04a5f..0a541a769 100644
--- a/vm/vm_debug.go
+++ b/vm/vm_debug.go
@@ -38,8 +38,23 @@ func NewDebugVm(env Environment) *DebugVm {
return &DebugVm{env: env, logTy: lt, Recoverable: true}
}
-func (self *DebugVm) RunClosure(closure *Closure) (ret []byte, err error) {
- self.depth++
+func (self *DebugVm) Run(me, caller ClosureRef, code []byte, value, gas, price *big.Int, callData []byte) (ret []byte, err error) {
+ self.env.SetDepth(self.env.Depth() + 1)
+
+ msg := self.env.State().Manifest().AddMessage(&state.Message{
+ To: me.Address(), From: caller.Address(),
+ Input: callData,
+ Origin: self.env.Origin(),
+ Block: self.env.BlockHash(), Timestamp: self.env.Time(), Coinbase: self.env.Coinbase(), Number: self.env.BlockNumber(),
+ Value: value,
+ })
+ closure := NewClosure(msg, caller, me, code, gas, price)
+
+ if self.env.Depth() == MaxCallDepth {
+ closure.UseGas(gas)
+
+ return closure.Return(nil), DepthError{}
+ }
if self.Recoverable {
// Recover from any require exception
@@ -60,35 +75,35 @@ func (self *DebugVm) RunClosure(closure *Closure) (ret []byte, err error) {
var (
op OpCode
- destinations = analyseJumpDests(closure.Code)
- mem = NewMemory()
- stack = NewStack()
- pc = big.NewInt(0)
- step = 0
- prevStep = 0
- statedb = self.env.State()
- require = func(m int) {
+ destinations = analyseJumpDests(closure.Code)
+ mem = NewMemory()
+ stack = NewStack()
+ pc uint64 = 0
+ step = 0
+ prevStep = 0
+ statedb = self.env.State()
+ require = func(m int) {
if stack.Len() < m {
panic(fmt.Sprintf("%04v (%v) stack err size = %d, required = %d", pc, op, stack.Len(), m))
}
}
- jump = func(from, to *big.Int) {
- p := int(to.Int64())
+ jump = func(from uint64, to *big.Int) {
+ p := to.Uint64()
self.Printf(" ~> %v", to)
// Return to start
if p == 0 {
- pc = big.NewInt(0)
+ pc = 0
} else {
nop := OpCode(closure.GetOp(p))
- if !(nop == JUMPDEST || destinations[from.Int64()] != nil) {
+ if !(nop == JUMPDEST || destinations[from] != nil) {
panic(fmt.Sprintf("JUMP missed JUMPDEST (%v) %v", nop, p))
} else if nop == JUMP || nop == JUMPI {
panic(fmt.Sprintf("not allowed to JUMP(I) in to JUMP"))
}
- pc = to
+ pc = to.Uint64()
}
@@ -96,17 +111,12 @@ func (self *DebugVm) RunClosure(closure *Closure) (ret []byte, err error) {
}
)
- // Debug hook
- if self.Dbg != nil {
- self.Dbg.SetCode(closure.Code)
- }
-
// Don't bother with the execution if there's no code.
- if len(closure.Code) == 0 {
+ if len(code) == 0 {
return closure.Return(nil), nil
}
- vmlogger.Debugf("(%d) %x gas: %v (d) %x\n", self.depth, closure.Address(), closure.Gas, closure.Args)
+ vmlogger.Debugf("(%d) %x gas: %v (d) %x\n", self.depth, closure.Address(), closure.Gas, callData)
for {
prevStep = step
@@ -115,26 +125,7 @@ func (self *DebugVm) RunClosure(closure *Closure) (ret []byte, err error) {
step++
// Get the memory location of pc
- op = closure.GetOp(int(pc.Uint64()))
-
- // XXX Leave this Println intact. Don't change this to the log system.
- // Used for creating diffs between implementations
- if self.logTy == LogTyDiff {
- switch op {
- case STOP, RETURN, SUICIDE:
- statedb.GetStateObject(closure.Address()).EachStorage(func(key string, value *ethutil.Value) {
- value.Decode()
- fmt.Printf("%x %x\n", new(big.Int).SetBytes([]byte(key)).Bytes(), value.Bytes())
- })
- }
-
- b := pc.Bytes()
- if len(b) == 0 {
- b = []byte{0}
- }
-
- fmt.Printf("%x %x %x %x\n", closure.Address(), b, []byte{byte(op)}, closure.Gas.Bytes())
- }
+ op = closure.GetOp(pc)
gas := new(big.Int)
addStepGasUsage := func(amount *big.Int) {
@@ -151,7 +142,7 @@ func (self *DebugVm) RunClosure(closure *Closure) (ret []byte, err error) {
// Stack checks only
case ISZERO, CALLDATALOAD, POP, JUMP, NOT: // 1
require(1)
- case ADD, SUB, DIV, SDIV, MOD, SMOD, EXP, LT, GT, SLT, SGT, EQ, AND, OR, XOR, BYTE: // 2
+ case ADD, SUB, DIV, SDIV, MOD, SMOD, LT, GT, SLT, SGT, EQ, AND, OR, XOR, BYTE: // 2
require(2)
case ADDMOD, MULMOD: // 3
require(3)
@@ -165,10 +156,23 @@ func (self *DebugVm) RunClosure(closure *Closure) (ret []byte, err error) {
n := int(op - LOG0)
require(n + 2)
- mSize, mStart := stack.Peekn()
gas.Set(GasLog)
addStepGasUsage(new(big.Int).Mul(big.NewInt(int64(n)), GasLog))
- addStepGasUsage(new(big.Int).Add(mSize, mStart))
+
+ mSize, mStart := stack.Peekn()
+ addStepGasUsage(mSize)
+
+ newMemSize = calcMemSize(mStart, mSize)
+ case EXP:
+ require(2)
+
+ exp := new(big.Int).Set(stack.data[stack.Len()-2])
+ nbytes := 0
+ for exp.Cmp(ethutil.Big0) > 0 {
+ nbytes += 1
+ exp.Rsh(exp, 8)
+ }
+ gas.Set(big.NewInt(int64(nbytes + 1)))
// Gas only
case STOP:
gas.Set(ethutil.Big0)
@@ -255,6 +259,12 @@ func (self *DebugVm) RunClosure(closure *Closure) (ret []byte, err error) {
newMemSize.Div(newMemSize, u256(32))
newMemSize.Mul(newMemSize, u256(32))
+ switch op {
+ // Additional gas usage on *CODPY
+ case CALLDATACOPY, CODECOPY, EXTCODECOPY:
+ addStepGasUsage(new(big.Int).Div(newMemSize, u256(32)))
+ }
+
if newMemSize.Cmp(u256(int64(mem.Len()))) > 0 {
memGasUsage := new(big.Int).Sub(newMemSize, u256(int64(mem.Len())))
memGasUsage.Mul(GasMemory, memGasUsage)
@@ -262,7 +272,6 @@ func (self *DebugVm) RunClosure(closure *Closure) (ret []byte, err error) {
addStepGasUsage(memGasUsage)
- mem.Resize(newMemSize.Uint64())
}
}
@@ -280,6 +289,8 @@ func (self *DebugVm) RunClosure(closure *Closure) (ret []byte, err error) {
return closure.Return(nil), OOG(gas, tmp)
}
+ mem.Resize(newMemSize.Uint64())
+
switch op {
// 0x20 range
case ADD:
@@ -576,8 +587,6 @@ func (self *DebugVm) RunClosure(closure *Closure) (ret []byte, err error) {
self.Printf(" => %x", caller)
case CALLVALUE:
- value := closure.exe.value
-
stack.Push(value)
self.Printf(" => %v", value)
@@ -585,27 +594,27 @@ func (self *DebugVm) RunClosure(closure *Closure) (ret []byte, err error) {
var (
offset = stack.Pop()
data = make([]byte, 32)
- lenData = big.NewInt(int64(len(closure.Args)))
+ lenData = big.NewInt(int64(len(callData)))
)
if lenData.Cmp(offset) >= 0 {
length := new(big.Int).Add(offset, ethutil.Big32)
length = ethutil.BigMin(length, lenData)
- copy(data, closure.Args[offset.Int64():length.Int64()])
+ copy(data, callData[offset.Int64():length.Int64()])
}
self.Printf(" => 0x%x", data)
stack.Push(ethutil.BigD(data))
case CALLDATASIZE:
- l := int64(len(closure.Args))
+ l := int64(len(callData))
stack.Push(big.NewInt(l))
self.Printf(" => %d", l)
case CALLDATACOPY:
var (
- size = int64(len(closure.Args))
+ size = int64(len(callData))
mOff = stack.Pop().Int64()
cOff = stack.Pop().Int64()
l = stack.Pop().Int64()
@@ -618,11 +627,11 @@ func (self *DebugVm) RunClosure(closure *Closure) (ret []byte, err error) {
l = 0
}
- code := closure.Args[cOff : cOff+l]
+ code := callData[cOff : cOff+l]
mem.Set(mOff, l, code)
- self.Printf(" => [%v, %v, %v] %x", mOff, cOff, l, code[cOff:cOff+l])
+ self.Printf(" => [%v, %v, %v] %x", mOff, cOff, l, callData[cOff:cOff+l])
case CODESIZE, EXTCODESIZE:
var code []byte
if op == EXTCODESIZE {
@@ -707,13 +716,15 @@ func (self *DebugVm) RunClosure(closure *Closure) (ret []byte, err error) {
// 0x50 range
case PUSH1, PUSH2, PUSH3, PUSH4, PUSH5, PUSH6, PUSH7, PUSH8, PUSH9, PUSH10, PUSH11, PUSH12, PUSH13, PUSH14, PUSH15, PUSH16, PUSH17, PUSH18, PUSH19, PUSH20, PUSH21, PUSH22, PUSH23, PUSH24, PUSH25, PUSH26, PUSH27, PUSH28, PUSH29, PUSH30, PUSH31, PUSH32:
- a := big.NewInt(int64(op) - int64(PUSH1) + 1)
- pc.Add(pc, ethutil.Big1)
- data := closure.Gets(pc, a)
+ //a := big.NewInt(int64(op) - int64(PUSH1) + 1)
+ a := uint64(op - PUSH1 + 1)
+ //pc.Add(pc, ethutil.Big1)
+ data := closure.GetRangeValue(pc+1, a)
val := ethutil.BigD(data.Bytes())
// Push value to stack
stack.Push(val)
- pc.Add(pc, a.Sub(a, big.NewInt(1)))
+ pc += a
+ //pc.Add(pc, a.Sub(a, big.NewInt(1)))
step += int(op) - int(PUSH1) + 1
@@ -722,13 +733,9 @@ func (self *DebugVm) RunClosure(closure *Closure) (ret []byte, err error) {
stack.Pop()
case DUP1, DUP2, DUP3, DUP4, DUP5, DUP6, DUP7, DUP8, DUP9, DUP10, DUP11, DUP12, DUP13, DUP14, DUP15, DUP16:
n := int(op - DUP1 + 1)
- v := stack.Dupn(n)
+ stack.Dupn(n)
self.Printf(" => [%d] 0x%x", n, stack.Peek().Bytes())
-
- if OpCode(closure.Get(new(big.Int).Add(pc, ethutil.Big1)).Uint()) == POP && OpCode(closure.Get(new(big.Int).Add(pc, big.NewInt(2))).Uint()) == POP {
- fmt.Println(toValue(v))
- }
case SWAP1, SWAP2, SWAP3, SWAP4, SWAP5, SWAP6, SWAP7, SWAP8, SWAP9, SWAP10, SWAP11, SWAP12, SWAP13, SWAP14, SWAP15, SWAP16:
n := int(op - SWAP1 + 2)
x, y := stack.Swapn(n)
@@ -737,13 +744,13 @@ func (self *DebugVm) RunClosure(closure *Closure) (ret []byte, err error) {
case LOG0, LOG1, LOG2, LOG3, LOG4:
n := int(op - LOG0)
topics := make([][]byte, n)
- mStart, mSize := stack.Pop().Int64(), stack.Pop().Int64()
+ mSize, mStart := stack.Pop().Int64(), stack.Pop().Int64()
data := mem.Geti(mStart, mSize)
for i := 0; i < n; i++ {
- topics[i] = stack.Pop().Bytes()
+ topics[i] = ethutil.LeftPadBytes(stack.Pop().Bytes(), 32)
}
- log := &state.Log{closure.Address(), topics, data}
+ log := &Log{closure.Address(), topics, data}
self.env.AddLog(log)
self.Printf(" => %v", log)
@@ -783,7 +790,6 @@ func (self *DebugVm) RunClosure(closure *Closure) (ret []byte, err error) {
self.Printf(" {0x%x : 0x%x}", loc.Bytes(), val.Bytes())
case JUMP:
-
jump(pc, stack.Pop())
continue
@@ -798,13 +804,14 @@ func (self *DebugVm) RunClosure(closure *Closure) (ret []byte, err error) {
case JUMPDEST:
case PC:
- stack.Push(pc)
+ stack.Push(big.NewInt(int64(pc)))
case MSIZE:
stack.Push(big.NewInt(int64(mem.Len())))
case GAS:
stack.Push(closure.Gas)
// 0x60 range
case CREATE:
+
var (
err error
value = stack.Pop()
@@ -826,17 +833,14 @@ func (self *DebugVm) RunClosure(closure *Closure) (ret []byte, err error) {
closure.UseGas(closure.Gas)
- msg := NewExecution(self, addr, input, gas, closure.Price, value)
- ret, err := msg.Create(closure)
+ ret, err, ref := self.env.Create(closure, addr, input, gas, price, value)
if err != nil {
stack.Push(ethutil.BigFalse)
- // Revert the state as it was before.
- //self.env.State().Set(snapshot)
-
self.Printf("CREATE err %v", err)
} else {
- msg.object.Code = ret
+ ref.SetCode(ret)
+ msg.Output = ret
stack.Push(ethutil.BigD(addr))
}
@@ -868,14 +872,14 @@ func (self *DebugVm) RunClosure(closure *Closure) (ret []byte, err error) {
executeAddr = addr.Bytes()
}
- msg := NewExecution(self, executeAddr, args, gas, closure.Price, value)
- ret, err := msg.Exec(addr.Bytes(), closure)
+ ret, err := self.env.Call(closure, executeAddr, args, gas, price, value)
if err != nil {
stack.Push(ethutil.BigFalse)
vmlogger.Debugln(err)
} else {
stack.Push(ethutil.BigTrue)
+ msg.Output = ret
mem.Set(retOffset.Int64(), retSize.Int64(), ret)
}
@@ -914,13 +918,13 @@ func (self *DebugVm) RunClosure(closure *Closure) (ret []byte, err error) {
return closure.Return(nil), fmt.Errorf("Invalid opcode %x", op)
}
- pc.Add(pc, ethutil.Big1)
+ pc++
self.Endl()
if self.Dbg != nil {
for _, instrNo := range self.Dbg.BreakPoints() {
- if pc.Cmp(big.NewInt(instrNo)) == 0 {
+ if pc == uint64(instrNo) {
self.Stepping = true
if !self.Dbg.BreakHook(prevStep, op, mem, stack, statedb.GetStateObject(closure.Address())) {
generated by cgit (git 2.34.1) at 2024-10-17 22:13:32 +0800