Merge branch 'release/0.9.0'

13 files changed, 1507 insertions, 1171 deletions

diff --git a/vm/address.go b/vm/address.go
index 611979c94..1c9369ab7 100644
--- a/vm/address.go
+++ b/vm/address.go
@@ -20,20 +20,37 @@ func (self PrecompiledAccount) Call(in []byte) []byte {
 	return self.fn(in)
 }
 
-var Precompiled = map[string]*PrecompiledAccount{
-	string(ethutil.LeftPadBytes([]byte{1}, 20)): &PrecompiledAccount{func(l int) *big.Int {
-		return GasEcrecover
-	}, ecrecoverFunc},
-	string(ethutil.LeftPadBytes([]byte{2}, 20)): &PrecompiledAccount{func(l int) *big.Int {
-		n := big.NewInt(int64(l+31)/32 + 1)
-		n.Mul(n, GasSha256)
-		return n
-	}, sha256Func},
-	string(ethutil.LeftPadBytes([]byte{3}, 20)): &PrecompiledAccount{func(l int) *big.Int {
-		n := big.NewInt(int64(l+31)/32 + 1)
-		n.Mul(n, GasRipemd)
-		return n
-	}, ripemd160Func},
+var Precompiled = PrecompiledContracts()
+
+// XXX Could set directly. Testing requires resetting and setting of pre compiled contracts.
+func PrecompiledContracts() map[string]*PrecompiledAccount {
+	return map[string]*PrecompiledAccount{
+		// ECRECOVER
+		string(ethutil.LeftPadBytes([]byte{1}, 20)): &PrecompiledAccount{func(l int) *big.Int {
+			return GasEcrecover
+		}, ecrecoverFunc},
+
+		// SHA256
+		string(ethutil.LeftPadBytes([]byte{2}, 20)): &PrecompiledAccount{func(l int) *big.Int {
+			n := big.NewInt(int64(l+31)/32 + 1)
+			n.Mul(n, GasSha256)
+			return n
+		}, sha256Func},
+
+		// RIPEMD160
+		string(ethutil.LeftPadBytes([]byte{3}, 20)): &PrecompiledAccount{func(l int) *big.Int {
+			n := big.NewInt(int64(l+31)/32 + 1)
+			n.Mul(n, GasRipemd)
+			return n
+		}, ripemd160Func},
+
+		string(ethutil.LeftPadBytes([]byte{4}, 20)): &PrecompiledAccount{func(l int) *big.Int {
+			n := big.NewInt(int64(l+31)/32 + 1)
+			n.Mul(n, GasMemCpy)
+
+			return n
+		}, memCpy},
+	}
 }
 
 func sha256Func(in []byte) []byte {
@@ -54,3 +71,7 @@ func ecrecoverFunc(in []byte) []byte {
 
 	return ethutil.LeftPadBytes(crypto.Sha3(crypto.Ecrecover(append(hash, sig...))[1:])[12:], 32)
 }
+
+func memCpy(in []byte) []byte {
+	return in
+}
diff --git a/vm/analysis.go b/vm/analysis.go
index fef448b7b..411df5686 100644
--- a/vm/analysis.go
+++ b/vm/analysis.go
@@ -1,34 +1,19 @@
 package vm
 
-import (
-	"math/big"
+import "gopkg.in/fatih/set.v0"
 
-	"github.com/ethereum/go-ethereum/ethutil"
-)
+func analyseJumpDests(code []byte) (dests *set.Set) {
+	dests = set.New()
 
-func analyseJumpDests(code []byte) (dests map[uint64]*big.Int) {
-	dests = make(map[uint64]*big.Int)
-
-	lp := false
-	var lpv *big.Int
 	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 := uint64(op) - uint64(PUSH1) + 1
-			if uint64(len(code)) > pc+1+a {
-				lpv = ethutil.BigD(code[pc+1 : pc+1+a])
-			}
 
 			pc += a
-			lp = true
-		case JUMP, JUMPI:
-			if lp {
-				dests[pc] = lpv
-			}
-
-		default:
-			lp = false
+		case JUMPDEST:
+			dests.Add(pc)
 		}
 	}
 	return
diff --git a/vm/closure.go b/vm/closure.go
deleted file mode 100644
index 97b31ada0..000000000
--- a/vm/closure.go
+++ /dev/null
@@ -1,107 +0,0 @@
-package vm
-
-import (
-	"math/big"
-
-	"github.com/ethereum/go-ethereum/state"
-)
-
-type ClosureRef interface {
-	ReturnGas(*big.Int, *big.Int)
-	Address() []byte
-	SetCode([]byte)
-}
-
-type Closure struct {
-	caller  ClosureRef
-	object  ClosureRef
-	Code    []byte
-	message *state.Message
-
-	Gas, UsedGas, Price *big.Int
-
-	Args []byte
-}
-
-// Create a new closure for the given data items
-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
-	// This pointer will be off the state transition
-	c.Gas = gas //new(big.Int).Set(gas)
-	// In most cases price and value are pointers to transaction objects
-	// and we don't want the transaction's values to change.
-	c.Price = new(big.Int).Set(price)
-	c.UsedGas = new(big.Int)
-
-	return c
-}
-
-func (c *Closure) GetOp(x uint64) OpCode {
-	return OpCode(c.GetByte(x))
-}
-
-func (c *Closure) GetByte(x uint64) byte {
-	if x < uint64(len(c.Code)) {
-		return c.Code[x]
-	}
-
-	return 0
-}
-
-func (c *Closure) GetBytes(x, y int) []byte {
-	if x >= len(c.Code) || y >= len(c.Code) {
-		return nil
-	}
-
-	return c.Code[x : x+y]
-}
-
-func (c *Closure) GetRangeValue(x, y uint64) []byte {
-	if x >= uint64(len(c.Code)) || y >= uint64(len(c.Code)) {
-		return nil
-	}
-
-	return c.Code[x : x+y]
-}
-
-func (c *Closure) Return(ret []byte) []byte {
-	// Return the remaining gas to the caller
-	c.caller.ReturnGas(c.Gas, c.Price)
-
-	return ret
-}
-
-/*
- * Gas functions
- */
-func (c *Closure) UseGas(gas *big.Int) bool {
-	if c.Gas.Cmp(gas) < 0 {
-		return false
-	}
-
-	// Sub the amount of gas from the remaining
-	c.Gas.Sub(c.Gas, gas)
-	c.UsedGas.Add(c.UsedGas, gas)
-
-	return true
-}
-
-// Implement the caller interface
-func (c *Closure) ReturnGas(gas, price *big.Int) {
-	// Return the gas to the closure
-	c.Gas.Add(c.Gas, gas)
-	c.UsedGas.Sub(c.UsedGas, gas)
-}
-
-/*
- * Set / Get
- */
-func (c *Closure) Address() []byte {
-	return c.object.Address()
-}
-
-func (self *Closure) SetCode(code []byte) {
-	self.Code = code
-}
diff --git a/vm/common.go b/vm/common.go
index 529bbdeb1..45a7187a9 100644
--- a/vm/common.go
+++ b/vm/common.go
@@ -9,15 +9,27 @@ import (
 
 var vmlogger = logger.NewLogger("VM")
 
-type Type int
+type Type byte
 
 const (
-	StandardVmTy Type = iota
-	DebugVmTy
+	StdVmTy Type = iota
+	JitVmTy
 
 	MaxVmTy
 )
 
+func NewVm(env Environment) VirtualMachine {
+	switch env.VmType() {
+	case JitVmTy:
+		return NewJitVm(env)
+	default:
+		vmlogger.Infoln("unsupported vm type %d", env.VmType())
+		fallthrough
+	case StdVmTy:
+		return New(env)
+	}
+}
+
 var (
 	GasStep         = big.NewInt(1)
 	GasSha          = big.NewInt(10)
@@ -38,6 +50,7 @@ var (
 	GasSha256       = big.NewInt(50)
 	GasRipemd       = big.NewInt(50)
 	GasEcrecover    = big.NewInt(500)
+	GasMemCpy       = big.NewInt(1)
 
 	Pow256 = ethutil.BigPow(2, 256)
 
@@ -48,7 +61,7 @@ var (
 	S256 = ethutil.S256
 )
 
-const MaxCallDepth = 1024
+const MaxCallDepth = 1025
 
 func calcMemSize(off, l *big.Int) *big.Int {
 	if l.Cmp(ethutil.Big0) == 0 {
diff --git a/vm/context.go b/vm/context.go
new file mode 100644
index 000000000..b48f1a657
--- /dev/null
+++ b/vm/context.go
@@ -0,0 +1,109 @@
+package vm
+
+import (
+	"math"
+	"math/big"
+
+	"github.com/ethereum/go-ethereum/ethutil"
+)
+
+type ContextRef interface {
+	ReturnGas(*big.Int, *big.Int)
+	Address() []byte
+	SetCode([]byte)
+}
+
+type Context struct {
+	caller ContextRef
+	object ContextRef
+	Code   []byte
+
+	Gas, UsedGas, Price *big.Int
+
+	Args []byte
+}
+
+// Create a new context for the given data items
+func NewContext(caller ContextRef, object ContextRef, code []byte, gas, price *big.Int) *Context {
+	c := &Context{caller: caller, object: object, Code: code, Args: nil}
+
+	// Gas should be a pointer so it can safely be reduced through the run
+	// This pointer will be off the state transition
+	c.Gas = gas //new(big.Int).Set(gas)
+	// In most cases price and value are pointers to transaction objects
+	// and we don't want the transaction's values to change.
+	c.Price = new(big.Int).Set(price)
+	c.UsedGas = new(big.Int)
+
+	return c
+}
+
+func (c *Context) GetOp(n uint64) OpCode {
+	return OpCode(c.GetByte(n))
+}
+
+func (c *Context) GetByte(n uint64) byte {
+	if n < uint64(len(c.Code)) {
+		return c.Code[n]
+	}
+
+	return 0
+}
+
+func (c *Context) GetBytes(x, y int) []byte {
+	return c.GetRangeValue(uint64(x), uint64(y))
+}
+
+func (c *Context) GetRangeValue(x, size uint64) []byte {
+	x = uint64(math.Min(float64(x), float64(len(c.Code))))
+	y := uint64(math.Min(float64(x+size), float64(len(c.Code))))
+
+	return ethutil.LeftPadBytes(c.Code[x:y], int(size))
+}
+
+func (c *Context) GetCode(x, size uint64) []byte {
+	x = uint64(math.Min(float64(x), float64(len(c.Code))))
+	y := uint64(math.Min(float64(x+size), float64(len(c.Code))))
+
+	return ethutil.RightPadBytes(c.Code[x:y], int(size))
+}
+
+func (c *Context) Return(ret []byte) []byte {
+	// Return the remaining gas to the caller
+	c.caller.ReturnGas(c.Gas, c.Price)
+
+	return ret
+}
+
+/*
+ * Gas functions
+ */
+func (c *Context) UseGas(gas *big.Int) bool {
+	if c.Gas.Cmp(gas) < 0 {
+		return false
+	}
+
+	// Sub the amount of gas from the remaining
+	c.Gas.Sub(c.Gas, gas)
+	c.UsedGas.Add(c.UsedGas, gas)
+
+	return true
+}
+
+// Implement the caller interface
+func (c *Context) ReturnGas(gas, price *big.Int) {
+	// Return the gas to the context
+	c.Gas.Add(c.Gas, gas)
+	c.UsedGas.Sub(c.UsedGas, gas)
+}
+
+/*
+ * Set / Get
+ */
+func (c *Context) Address() []byte {
+	return c.object.Address()
+}
+
+func (self *Context) SetCode(code []byte) {
+	self.Code = code
+}
diff --git a/vm/environment.go b/vm/environment.go
index 969bc5e43..8507e248f 100644
--- a/vm/environment.go
+++ b/vm/environment.go
@@ -14,26 +14,22 @@ type Environment interface {
 
 	Origin() []byte
 	BlockNumber() *big.Int
-	PrevHash() []byte
+	GetHash(n uint64) []byte
 	Coinbase() []byte
 	Time() int64
 	Difficulty() *big.Int
-	BlockHash() []byte
 	GasLimit() *big.Int
 	Transfer(from, to Account, amount *big.Int) error
 	AddLog(state.Log)
 
+	VmType() Type
+
 	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 {
-	GetStorage(key *big.Int) *ethutil.Value
-	SetStorage(key *big.Int, value *ethutil.Value)
+	Call(me ContextRef, addr, data []byte, gas, price, value *big.Int) ([]byte, error)
+	CallCode(me ContextRef, addr, data []byte, gas, price, value *big.Int) ([]byte, error)
+	Create(me ContextRef, addr, data []byte, gas, price, value *big.Int) ([]byte, error, ContextRef)
 }
 
 type Account interface {
diff --git a/vm/stack.go b/vm/stack.go
index 6091479cb..a9aafdb9d 100644
--- a/vm/stack.go
+++ b/vm/stack.go
@@ -2,7 +2,6 @@ package vm
 
 import (
 	"fmt"
-	"math"
 	"math/big"
 )
 
@@ -91,6 +90,12 @@ func (st *Stack) Get(amount *big.Int) []*big.Int {
 	return nil
 }
 
+func (st *Stack) require(n int) {
+	if st.Len() < n {
+		panic(fmt.Sprintf("stack underflow (%d <=> %d)", st.Len(), n))
+	}
+}
+
 func (st *Stack) Print() {
 	fmt.Println("### stack ###")
 	if len(st.data) > 0 {
@@ -135,17 +140,11 @@ func (m *Memory) Resize(size uint64) {
 	}
 }
 
-func (m *Memory) Get(offset, size int64) []byte {
-	if len(m.store) > int(offset) {
-		end := int(math.Min(float64(len(m.store)), float64(offset+size)))
-
-		return m.store[offset:end]
+func (self *Memory) Get(offset, size int64) (cpy []byte) {
+	if size == 0 {
+		return nil
 	}
 
-	return nil
-}
-
-func (self *Memory) Geti(offset, size int64) (cpy []byte) {
 	if len(self.store) > int(offset) {
 		cpy = make([]byte, size)
 		copy(cpy, self.store[offset:offset+size])
diff --git a/vm/types.go b/vm/types.go
index ec9c7e74e..1ea80a212 100644
--- a/vm/types.go
+++ b/vm/types.go
@@ -59,7 +59,7 @@ const (
 const (
 
 	// 0x40 range - block operations
-	PREVHASH OpCode = 0x40 + iota
+	BLOCKHASH OpCode = 0x40 + iota
 	COINBASE
 	TIMESTAMP
 	NUMBER
@@ -216,7 +216,7 @@ var opCodeToString = map[OpCode]string{
 	GASPRICE:     "TXGASPRICE",
 
 	// 0x40 range - block operations
-	PREVHASH:    "PREVHASH",
+	BLOCKHASH:   "BLOCKHASH",
 	COINBASE:    "COINBASE",
 	TIMESTAMP:   "TIMESTAMP",
 	NUMBER:      "NUMBER",
diff --git a/vm/virtual_machine.go b/vm/virtual_machine.go
index 3b6f98ab2..23ac4878f 100644
--- a/vm/virtual_machine.go
+++ b/vm/virtual_machine.go
@@ -4,7 +4,7 @@ import "math/big"
 
 type VirtualMachine interface {
 	Env() Environment
-	Run(me, caller ClosureRef, code []byte, value, gas, price *big.Int, data []byte) ([]byte, error)
+	Run(me, caller ContextRef, code []byte, value, gas, price *big.Int, data []byte) ([]byte, error)
 	Printf(string, ...interface{}) VirtualMachine
 	Endl() VirtualMachine
 }
diff --git a/vm/vm.go b/vm/vm.go
index 22172cb3a..5ec507ddc 100644
--- a/vm/vm.go
+++ b/vm/vm.go
@@ -1,36 +1,958 @@
 package vm
 
-import "math/big"
+import (
+	"fmt"
+	"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
+	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/ethereum/go-ethereum/ethutil"
+	"github.com/ethereum/go-ethereum/state"
+)
 
 type Vm struct {
-	env   Environment
-	err   error
-	depth int
+	env Environment
+
+	logTy  byte
+	logStr string
+
+	err error
+
+	Dbg Debugger
+
+	BreakPoints []int64
+	Stepping    bool
+	Fn          string
+
+	Recoverable bool
 }
 
-func New(env Environment, typ Type) VirtualMachine {
-	switch typ {
-	case DebugVmTy:
-		return NewDebugVm(env)
-	default:
-		return &Vm{env: env}
+func New(env Environment) *Vm {
+	lt := LogTyPretty
+	if ethutil.Config.Diff {
+		lt = LogTyDiff
 	}
+
+	return &Vm{env: env, logTy: lt, Recoverable: true}
 }
 
-func (self *Vm) Run(me, caller ClosureRef, code []byte, value, gas, price *big.Int, data []byte) (ret []byte, err error) {
-	panic("not implemented")
+func (self *Vm) Run(me, caller ContextRef, code []byte, value, gas, price *big.Int, callData []byte) (ret []byte, err error) {
+	self.env.SetDepth(self.env.Depth() + 1)
+
+	context := NewContext(caller, me, code, gas, price)
+
+	vmlogger.Debugf("(%d) (%x) %x (code=%d) gas: %v (d) %x\n", self.env.Depth(), caller.Address()[:4], context.Address(), len(code), context.Gas, callData)
+
+	if self.Recoverable {
+		// Recover from any require exception
+		defer func() {
+			if r := recover(); r != nil {
+				self.Printf(" %v", r).Endl()
+
+				context.UseGas(context.Gas)
+
+				ret = context.Return(nil)
+
+				err = fmt.Errorf("%v", r)
+
+			}
+		}()
+	}
+
+	if p := Precompiled[string(me.Address())]; p != nil {
+		return self.RunPrecompiled(p, callData, context)
+	}
+
+	var (
+		op OpCode
+
+		destinations        = analyseJumpDests(context.Code)
+		mem                 = NewMemory()
+		stack               = NewStack()
+		pc           uint64 = 0
+		step                = 0
+		prevStep            = 0
+		statedb             = self.env.State()
+
+		jump = func(from uint64, to *big.Int) {
+			p := to.Uint64()
+
+			nop := context.GetOp(p)
+			if !destinations.Has(p) {
+				panic(fmt.Sprintf("invalid jump destination (%v) %v", nop, p))
+			}
+
+			self.Printf(" ~> %v", to)
+			pc = to.Uint64()
+
+			self.Endl()
+		}
+	)
+
+	// Don't bother with the execution if there's no code.
+	if len(code) == 0 {
+		return context.Return(nil), nil
+	}
+
+	for {
+		prevStep = step
+		// The base for all big integer arithmetic
+		base := new(big.Int)
+
+		step++
+		// Get the memory location of pc
+		op = context.GetOp(pc)
+
+		self.Printf("(pc) %-3d -o- %-14s (m) %-4d (s) %-4d ", pc, op.String(), mem.Len(), stack.Len())
+		if self.Dbg != nil {
+			//self.Dbg.Step(self, op, mem, stack, context)
+		}
+
+		newMemSize, gas := self.calculateGasAndSize(context, caller, op, statedb, mem, stack)
+
+		self.Printf("(g) %-3v (%v)", gas, context.Gas)
+
+		if !context.UseGas(gas) {
+			self.Endl()
+
+			tmp := new(big.Int).Set(context.Gas)
+
+			context.UseGas(context.Gas)
+
+			return context.Return(nil), OOG(gas, tmp)
+		}
+
+		mem.Resize(newMemSize.Uint64())
+
+		switch op {
+		// 0x20 range
+		case ADD:
+			x, y := stack.Popn()
+			self.Printf(" %v + %v", y, x)
+
+			base.Add(y, x)
+
+			U256(base)
+
+			self.Printf(" = %v", base)
+			// Pop result back on the stack
+			stack.Push(base)
+		case SUB:
+			x, y := stack.Popn()
+			self.Printf(" %v - %v", y, x)
+
+			base.Sub(y, x)
+
+			U256(base)
+
+			self.Printf(" = %v", base)
+			// Pop result back on the stack
+			stack.Push(base)
+		case MUL:
+			x, y := stack.Popn()
+			self.Printf(" %v * %v", y, x)
+
+			base.Mul(y, x)
+
+			U256(base)
+
+			self.Printf(" = %v", base)
+			// Pop result back on the stack
+			stack.Push(base)
+		case DIV:
+			x, y := stack.Pop(), stack.Pop()
+			self.Printf(" %v / %v", x, y)
+
+			if y.Cmp(ethutil.Big0) != 0 {
+				base.Div(x, y)
+			}
+
+			U256(base)
+
+			self.Printf(" = %v", base)
+			// Pop result back on the stack
+			stack.Push(base)
+		case SDIV:
+			x, y := S256(stack.Pop()), S256(stack.Pop())
+
+			self.Printf(" %v / %v", x, y)
+
+			if y.Cmp(ethutil.Big0) == 0 {
+				base.Set(ethutil.Big0)
+			} else {
+				n := new(big.Int)
+				if new(big.Int).Mul(x, y).Cmp(ethutil.Big0) < 0 {
+					n.SetInt64(-1)
+				} else {
+					n.SetInt64(1)
+				}
+
+				base.Div(x.Abs(x), y.Abs(y)).Mul(base, n)
+
+				U256(base)
+			}
+
+			self.Printf(" = %v", base)
+			stack.Push(base)
+		case MOD:
+			x, y := stack.Pop(), stack.Pop()
+
+			self.Printf(" %v %% %v", x, y)
+
+			if y.Cmp(ethutil.Big0) == 0 {
+				base.Set(ethutil.Big0)
+			} else {
+				base.Mod(x, y)
+			}
+
+			U256(base)
+
+			self.Printf(" = %v", base)
+			stack.Push(base)
+		case SMOD:
+			x, y := S256(stack.Pop()), S256(stack.Pop())
+
+			self.Printf(" %v %% %v", x, y)
+
+			if y.Cmp(ethutil.Big0) == 0 {
+				base.Set(ethutil.Big0)
+			} else {
+				n := new(big.Int)
+				if x.Cmp(ethutil.Big0) < 0 {
+					n.SetInt64(-1)
+				} else {
+					n.SetInt64(1)
+				}
+
+				base.Mod(x.Abs(x), y.Abs(y)).Mul(base, n)
+
+				U256(base)
+			}
+
+			self.Printf(" = %v", base)
+			stack.Push(base)
+
+		case EXP:
+			x, y := stack.Popn()
+
+			self.Printf(" %v ** %v", y, x)
+
+			base.Exp(y, x, Pow256)
+
+			U256(base)
+
+			self.Printf(" = %v", base)
+
+			stack.Push(base)
+		case SIGNEXTEND:
+			back := stack.Pop().Uint64()
+			if back < 31 {
+				bit := uint(back*8 + 7)
+				num := stack.Pop()
+				mask := new(big.Int).Lsh(ethutil.Big1, bit)
+				mask.Sub(mask, ethutil.Big1)
+				if ethutil.BitTest(num, int(bit)) {
+					num.Or(num, mask.Not(mask))
+				} else {
+					num.And(num, mask)
+				}
+
+				num = U256(num)
+
+				self.Printf(" = %v", num)
+
+				stack.Push(num)
+			}
+		case NOT:
+			base.Sub(Pow256, stack.Pop()).Sub(base, ethutil.Big1)
+
+			// Not needed
+			base = U256(base)
+
+			stack.Push(base)
+		case LT:
+			x, y := stack.Popn()
+			self.Printf(" %v < %v", y, x)
+			// x < y
+			if y.Cmp(x) < 0 {
+				stack.Push(ethutil.BigTrue)
+			} else {
+				stack.Push(ethutil.BigFalse)
+			}
+		case GT:
+			x, y := stack.Popn()
+			self.Printf(" %v > %v", y, x)
+
+			// x > y
+			if y.Cmp(x) > 0 {
+				stack.Push(ethutil.BigTrue)
+			} else {
+				stack.Push(ethutil.BigFalse)
+			}
+
+		case SLT:
+			y, x := S256(stack.Pop()), S256(stack.Pop())
+			self.Printf(" %v < %v", y, x)
+			// x < y
+			if y.Cmp(S256(x)) < 0 {
+				stack.Push(ethutil.BigTrue)
+			} else {
+				stack.Push(ethutil.BigFalse)
+			}
+		case SGT:
+			y, x := S256(stack.Pop()), S256(stack.Pop())
+			self.Printf(" %v > %v", y, x)
+
+			// x > y
+			if y.Cmp(x) > 0 {
+				stack.Push(ethutil.BigTrue)
+			} else {
+				stack.Push(ethutil.BigFalse)
+			}
+
+		case EQ:
+			x, y := stack.Popn()
+			self.Printf(" %v == %v", y, x)
+
+			// x == y
+			if x.Cmp(y) == 0 {
+				stack.Push(ethutil.BigTrue)
+			} else {
+				stack.Push(ethutil.BigFalse)
+			}
+		case ISZERO:
+			x := stack.Pop()
+			if x.Cmp(ethutil.BigFalse) > 0 {
+				stack.Push(ethutil.BigFalse)
+			} else {
+				stack.Push(ethutil.BigTrue)
+			}
+
+			// 0x10 range
+		case AND:
+			x, y := stack.Popn()
+			self.Printf(" %v & %v", y, x)
+
+			stack.Push(base.And(y, x))
+		case OR:
+			x, y := stack.Popn()
+			self.Printf(" %v | %v", y, x)
+
+			stack.Push(base.Or(y, x))
+		case XOR:
+			x, y := stack.Popn()
+			self.Printf(" %v ^ %v", y, x)
+
+			stack.Push(base.Xor(y, x))
+		case BYTE:
+			val, th := stack.Popn()
+
+			if th.Cmp(big.NewInt(32)) < 0 {
+				byt := big.NewInt(int64(ethutil.LeftPadBytes(val.Bytes(), 32)[th.Int64()]))
+
+				base.Set(byt)
+			} else {
+				base.Set(ethutil.BigFalse)
+			}
+
+			self.Printf(" => 0x%x", base.Bytes())
+
+			stack.Push(base)
+		case ADDMOD:
+
+			x := stack.Pop()
+			y := stack.Pop()
+			z := stack.Pop()
+
+			add := new(big.Int).Add(x, y)
+			if len(z.Bytes()) > 0 { // NOT 0x0
+				base.Mod(add, z)
+
+				U256(base)
+			}
+
+			self.Printf(" %v + %v %% %v = %v", x, y, z, base)
+
+			stack.Push(base)
+		case MULMOD:
+
+			x := stack.Pop()
+			y := stack.Pop()
+			z := stack.Pop()
+
+			mul := new(big.Int).Mul(x, y)
+			if len(z.Bytes()) > 0 { // NOT 0x0
+				base.Mod(mul, z)
+
+				U256(base)
+			}
+
+			self.Printf(" %v + %v %% %v = %v", x, y, z, base)
+
+			stack.Push(base)
+
+			// 0x20 range
+		case SHA3:
+			size, offset := stack.Popn()
+			data := crypto.Sha3(mem.Get(offset.Int64(), size.Int64()))
+
+			stack.Push(ethutil.BigD(data))
+
+			self.Printf(" => %x", data)
+			// 0x30 range
+		case ADDRESS:
+			stack.Push(ethutil.BigD(context.Address()))
+
+			self.Printf(" => %x", context.Address())
+		case BALANCE:
+
+			addr := stack.Pop().Bytes()
+			balance := statedb.GetBalance(addr)
+
+			stack.Push(balance)
+
+			self.Printf(" => %v (%x)", balance, addr)
+		case ORIGIN:
+			origin := self.env.Origin()
+
+			stack.Push(ethutil.BigD(origin))
+
+			self.Printf(" => %x", origin)
+		case CALLER:
+			caller := context.caller.Address()
+			stack.Push(ethutil.BigD(caller))
+
+			self.Printf(" => %x", caller)
+		case CALLVALUE:
+			stack.Push(value)
+
+			self.Printf(" => %v", value)
+		case CALLDATALOAD:
+			var (
+				offset  = stack.Pop()
+				data    = make([]byte, 32)
+				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, callData[offset.Int64():length.Int64()])
+			}
+
+			self.Printf(" => 0x%x", data)
+
+			stack.Push(ethutil.BigD(data))
+		case CALLDATASIZE:
+			l := int64(len(callData))
+			stack.Push(big.NewInt(l))
+
+			self.Printf(" => %d", l)
+		case CALLDATACOPY:
+			var (
+				size = uint64(len(callData))
+				mOff = stack.Pop().Uint64()
+				cOff = stack.Pop().Uint64()
+				l    = stack.Pop().Uint64()
+			)
+
+			if cOff > size {
+				cOff = 0
+				l = 0
+			} else if cOff+l > size {
+				l = 0
+			}
+
+			code := callData[cOff : cOff+l]
+
+			mem.Set(mOff, l, code)
+
+			self.Printf(" => [%v, %v, %v] %x", mOff, cOff, l, callData[cOff:cOff+l])
+		case CODESIZE, EXTCODESIZE:
+			var code []byte
+			if op == EXTCODESIZE {
+				addr := stack.Pop().Bytes()
+
+				code = statedb.GetCode(addr)
+			} else {
+				code = context.Code
+			}
+
+			l := big.NewInt(int64(len(code)))
+			stack.Push(l)
+
+			self.Printf(" => %d", l)
+		case CODECOPY, EXTCODECOPY:
+			var code []byte
+			if op == EXTCODECOPY {
+				code = statedb.GetCode(stack.Pop().Bytes())
+			} else {
+				code = context.Code
+			}
+			context := NewContext(nil, nil, code, ethutil.Big0, ethutil.Big0)
+			var (
+				mOff = stack.Pop().Uint64()
+				cOff = stack.Pop().Uint64()
+				l    = stack.Pop().Uint64()
+			)
+			codeCopy := context.GetCode(cOff, l)
+
+			mem.Set(mOff, l, codeCopy)
+
+			self.Printf(" => [%v, %v, %v] %x", mOff, cOff, l, codeCopy)
+		case GASPRICE:
+			stack.Push(context.Price)
+
+			self.Printf(" => %x", context.Price)
+
+			// 0x40 range
+		case BLOCKHASH:
+			num := stack.Pop()
+
+			n := new(big.Int).Sub(self.env.BlockNumber(), ethutil.Big257)
+			if num.Cmp(n) > 0 && num.Cmp(self.env.BlockNumber()) < 0 {
+				stack.Push(ethutil.BigD(self.env.GetHash(num.Uint64())))
+			} else {
+				stack.Push(ethutil.Big0)
+			}
+
+			self.Printf(" => 0x%x", stack.Peek().Bytes())
+		case COINBASE:
+			coinbase := self.env.Coinbase()
+
+			stack.Push(ethutil.BigD(coinbase))
+
+			self.Printf(" => 0x%x", coinbase)
+		case TIMESTAMP:
+			time := self.env.Time()
+
+			stack.Push(big.NewInt(time))
+
+			self.Printf(" => 0x%x", time)
+		case NUMBER:
+			number := self.env.BlockNumber()
+
+			stack.Push(U256(number))
+
+			self.Printf(" => 0x%x", number.Bytes())
+		case DIFFICULTY:
+			difficulty := self.env.Difficulty()
+
+			stack.Push(difficulty)
+
+			self.Printf(" => 0x%x", difficulty.Bytes())
+		case GASLIMIT:
+			self.Printf(" => %v", self.env.GasLimit())
+
+			stack.Push(self.env.GasLimit())
+
+			// 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 := uint64(op - PUSH1 + 1)
+			byts := context.GetRangeValue(pc+1, a)
+			// Push value to stack
+			stack.Push(ethutil.BigD(byts))
+			pc += a
+
+			step += int(op) - int(PUSH1) + 1
+
+			self.Printf(" => 0x%x", byts)
+		case POP:
+			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)
+
+			self.Printf(" => [%d] 0x%x", n, stack.Peek().Bytes())
+		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)
+
+			self.Printf(" => [%d] %x [0] %x", n, x.Bytes(), y.Bytes())
+		case LOG0, LOG1, LOG2, LOG3, LOG4:
+			n := int(op - LOG0)
+			topics := make([][]byte, n)
+			mSize, mStart := stack.Popn()
+			for i := 0; i < n; i++ {
+				topics[i] = ethutil.LeftPadBytes(stack.Pop().Bytes(), 32)
+			}
+
+			data := mem.Get(mStart.Int64(), mSize.Int64())
+			log := &Log{context.Address(), topics, data}
+			self.env.AddLog(log)
+
+			self.Printf(" => %v", log)
+		case MLOAD:
+			offset := stack.Pop()
+			val := ethutil.BigD(mem.Get(offset.Int64(), 32))
+			stack.Push(val)
+
+			self.Printf(" => 0x%x", val.Bytes())
+		case MSTORE: // Store the value at stack top-1 in to memory at location stack top
+			// Pop value of the stack
+			val, mStart := stack.Popn()
+			mem.Set(mStart.Uint64(), 32, ethutil.BigToBytes(val, 256))
+
+			self.Printf(" => 0x%x", val)
+		case MSTORE8:
+			off := stack.Pop()
+			val := stack.Pop()
+
+			mem.store[off.Int64()] = byte(val.Int64() & 0xff)
+
+			self.Printf(" => [%v] 0x%x", off, val)
+		case SLOAD:
+			loc := stack.Pop()
+			val := ethutil.BigD(statedb.GetState(context.Address(), loc.Bytes()))
+			stack.Push(val)
+
+			self.Printf(" {0x%x : 0x%x}", loc.Bytes(), val.Bytes())
+		case SSTORE:
+			val, loc := stack.Popn()
+			statedb.SetState(context.Address(), loc.Bytes(), val)
+
+			self.Printf(" {0x%x : 0x%x}", loc.Bytes(), val.Bytes())
+		case JUMP:
+			jump(pc, stack.Pop())
+
+			continue
+		case JUMPI:
+			cond, pos := stack.Popn()
+
+			if cond.Cmp(ethutil.BigTrue) >= 0 {
+				jump(pc, pos)
+
+				continue
+			}
+
+			self.Printf(" ~> false")
+
+		case JUMPDEST:
+		case PC:
+			stack.Push(big.NewInt(int64(pc)))
+		case MSIZE:
+			stack.Push(big.NewInt(int64(mem.Len())))
+		case GAS:
+			stack.Push(context.Gas)
+
+			self.Printf(" => %x", context.Gas)
+			// 0x60 range
+		case CREATE:
+
+			var (
+				value        = stack.Pop()
+				size, offset = stack.Popn()
+				input        = mem.Get(offset.Int64(), size.Int64())
+				gas          = new(big.Int).Set(context.Gas)
+				addr         []byte
+			)
+			self.Endl()
+
+			context.UseGas(context.Gas)
+			ret, suberr, ref := self.env.Create(context, nil, input, gas, price, value)
+			if suberr != nil {
+				stack.Push(ethutil.BigFalse)
+
+				self.Printf(" (*) 0x0 %v", suberr)
+			} else {
+
+				// gas < len(ret) * CreateDataGas == NO_CODE
+				dataGas := big.NewInt(int64(len(ret)))
+				dataGas.Mul(dataGas, GasCreateByte)
+				if context.UseGas(dataGas) {
+					ref.SetCode(ret)
+				}
+				addr = ref.Address()
+
+				stack.Push(ethutil.BigD(addr))
+
+			}
+
+			// Debug hook
+			if self.Dbg != nil {
+				self.Dbg.SetCode(context.Code)
+			}
+		case CALL, CALLCODE:
+			gas := stack.Pop()
+			// Pop gas and value of the stack.
+			value, addr := stack.Popn()
+			value = U256(value)
+			// Pop input size and offset
+			inSize, inOffset := stack.Popn()
+			// Pop return size and offset
+			retSize, retOffset := stack.Popn()
+
+			address := ethutil.Address(addr.Bytes())
+			self.Printf(" => %x", address).Endl()
+
+			// Get the arguments from the memory
+			args := mem.Get(inOffset.Int64(), inSize.Int64())
+
+			var (
+				ret []byte
+				err error
+			)
+			if op == CALLCODE {
+				ret, err = self.env.CallCode(context, address, args, gas, price, value)
+			} else {
+				ret, err = self.env.Call(context, address, args, gas, price, value)
+			}
+
+			if err != nil {
+				stack.Push(ethutil.BigFalse)
+
+				vmlogger.Debugln(err)
+			} else {
+				stack.Push(ethutil.BigTrue)
+
+				mem.Set(retOffset.Uint64(), retSize.Uint64(), ret)
+			}
+			self.Printf("resume %x (%v)", context.Address(), context.Gas)
+
+			// Debug hook
+			if self.Dbg != nil {
+				self.Dbg.SetCode(context.Code)
+			}
+
+		case RETURN:
+			size, offset := stack.Popn()
+			ret := mem.Get(offset.Int64(), size.Int64())
+
+			self.Printf(" => [%v, %v] (%d) 0x%x", offset, size, len(ret), ret).Endl()
+
+			return context.Return(ret), nil
+		case SUICIDE:
+			receiver := statedb.GetOrNewStateObject(stack.Pop().Bytes())
+			balance := statedb.GetBalance(context.Address())
+
+			self.Printf(" => (%x) %v", receiver.Address()[:4], balance)
+
+			receiver.AddAmount(balance)
+			statedb.Delete(context.Address())
+
+			fallthrough
+		case STOP: // Stop the context
+			self.Endl()
+
+			return context.Return(nil), nil
+		default:
+			vmlogger.Debugf("(pc) %-3v Invalid opcode %x\n", pc, op)
+
+			panic(fmt.Errorf("Invalid opcode %x", op))
+		}
+
+		pc++
+
+		self.Endl()
+
+		if self.Dbg != nil {
+			for _, instrNo := range self.Dbg.BreakPoints() {
+				if pc == uint64(instrNo) {
+					self.Stepping = true
+
+					if !self.Dbg.BreakHook(prevStep, op, mem, stack, statedb.GetStateObject(context.Address())) {
+						return nil, nil
+					}
+				} else if self.Stepping {
+					if !self.Dbg.StepHook(prevStep, op, mem, stack, statedb.GetStateObject(context.Address())) {
+						return nil, nil
+					}
+				}
+			}
+		}
+
+	}
 }
 
-func (self *Vm) Env() Environment {
-	return self.env
+func (self *Vm) calculateGasAndSize(context *Context, caller ContextRef, op OpCode, statedb *state.StateDB, mem *Memory, stack *Stack) (*big.Int, *big.Int) {
+	gas := new(big.Int)
+	addStepGasUsage := func(amount *big.Int) {
+		if amount.Cmp(ethutil.Big0) >= 0 {
+			gas.Add(gas, amount)
+		}
+	}
+
+	addStepGasUsage(GasStep)
+
+	var newMemSize *big.Int = ethutil.Big0
+	var additionalGas *big.Int = new(big.Int)
+	// Stack Check, memory resize & gas phase
+	switch op {
+	// Stack checks only
+	case ISZERO, CALLDATALOAD, POP, JUMP, NOT: // 1
+		stack.require(1)
+	case JUMPI, ADD, SUB, DIV, SDIV, MOD, SMOD, LT, GT, SLT, SGT, EQ, AND, OR, XOR, BYTE, SIGNEXTEND: // 2
+		stack.require(2)
+	case ADDMOD, MULMOD: // 3
+		stack.require(3)
+	case SWAP1, SWAP2, SWAP3, SWAP4, SWAP5, SWAP6, SWAP7, SWAP8, SWAP9, SWAP10, SWAP11, SWAP12, SWAP13, SWAP14, SWAP15, SWAP16:
+		n := int(op - SWAP1 + 2)
+		stack.require(n)
+	case DUP1, DUP2, DUP3, DUP4, DUP5, DUP6, DUP7, DUP8, DUP9, DUP10, DUP11, DUP12, DUP13, DUP14, DUP15, DUP16:
+		n := int(op - DUP1 + 1)
+		stack.require(n)
+	case LOG0, LOG1, LOG2, LOG3, LOG4:
+		n := int(op - LOG0)
+		stack.require(n + 2)
+
+		gas.Set(GasLog)
+		addStepGasUsage(new(big.Int).Mul(big.NewInt(int64(n)), GasLog))
+
+		mSize, mStart := stack.Peekn()
+		addStepGasUsage(mSize)
+
+		newMemSize = calcMemSize(mStart, mSize)
+	case EXP:
+		stack.require(2)
+
+		gas.Set(big.NewInt(int64(len(stack.data[stack.Len()-2].Bytes()) + 1)))
+	// Gas only
+	case STOP:
+		gas.Set(ethutil.Big0)
+	case SUICIDE:
+		stack.require(1)
+
+		gas.Set(ethutil.Big0)
+	case SLOAD:
+		stack.require(1)
+
+		gas.Set(GasSLoad)
+	// Memory resize & Gas
+	case SSTORE:
+		stack.require(2)
+
+		var mult *big.Int
+		y, x := stack.Peekn()
+		val := statedb.GetState(context.Address(), x.Bytes())
+		if len(val) == 0 && len(y.Bytes()) > 0 {
+			// 0 => non 0
+			mult = ethutil.Big3
+		} else if len(val) > 0 && len(y.Bytes()) == 0 {
+			statedb.Refund(caller.Address(), GasSStoreRefund)
+
+			mult = ethutil.Big0
+		} else {
+			// non 0 => non 0 (or 0 => 0)
+			mult = ethutil.Big1
+		}
+		gas.Set(new(big.Int).Mul(mult, GasSStore))
+	case BALANCE:
+		stack.require(1)
+		gas.Set(GasBalance)
+	case MSTORE:
+		stack.require(2)
+		newMemSize = calcMemSize(stack.Peek(), u256(32))
+	case MLOAD:
+		stack.require(1)
+
+		newMemSize = calcMemSize(stack.Peek(), u256(32))
+	case MSTORE8:
+		stack.require(2)
+		newMemSize = calcMemSize(stack.Peek(), u256(1))
+	case RETURN:
+		stack.require(2)
+
+		newMemSize = calcMemSize(stack.Peek(), stack.data[stack.Len()-2])
+	case SHA3:
+		stack.require(2)
+		gas.Set(GasSha)
+		newMemSize = calcMemSize(stack.Peek(), stack.data[stack.Len()-2])
+		additionalGas.Set(stack.data[stack.Len()-2])
+	case CALLDATACOPY:
+		stack.require(2)
+
+		newMemSize = calcMemSize(stack.Peek(), stack.data[stack.Len()-3])
+		additionalGas.Set(stack.data[stack.Len()-3])
+	case CODECOPY:
+		stack.require(3)
+
+		newMemSize = calcMemSize(stack.Peek(), stack.data[stack.Len()-3])
+		additionalGas.Set(stack.data[stack.Len()-3])
+	case EXTCODECOPY:
+		stack.require(4)
+
+		newMemSize = calcMemSize(stack.data[stack.Len()-2], stack.data[stack.Len()-4])
+		additionalGas.Set(stack.data[stack.Len()-4])
+	case CALL, CALLCODE:
+		stack.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:
+		stack.require(3)
+		gas.Set(GasCreate)
+
+		newMemSize = calcMemSize(stack.data[stack.Len()-2], stack.data[stack.Len()-3])
+	}
+
+	switch op {
+	case CALLDATACOPY, CODECOPY, EXTCODECOPY:
+		additionalGas.Add(additionalGas, u256(31))
+		additionalGas.Div(additionalGas, u256(32))
+		addStepGasUsage(additionalGas)
+	case SHA3:
+		additionalGas.Add(additionalGas, u256(31))
+		additionalGas.Div(additionalGas, u256(32))
+		additionalGas.Mul(additionalGas, GasSha3Byte)
+		addStepGasUsage(additionalGas)
+	}
+
+	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)
+		}
+
+	}
+
+	return newMemSize, gas
+}
+
+func (self *Vm) RunPrecompiled(p *PrecompiledAccount, callData []byte, context *Context) (ret []byte, err error) {
+	gas := p.Gas(len(callData))
+	if context.UseGas(gas) {
+		ret = p.Call(callData)
+		self.Printf("NATIVE_FUNC => %x", ret)
+		self.Endl()
+
+		return context.Return(ret), nil
+	} else {
+		self.Printf("NATIVE_FUNC => failed").Endl()
+
+		tmp := new(big.Int).Set(context.Gas)
+
+		panic(OOG(gas, tmp).Error())
+	}
+}
+
+func (self *Vm) Printf(format string, v ...interface{}) VirtualMachine {
+	if self.logTy == LogTyPretty {
+		self.logStr += fmt.Sprintf(format, v...)
+	}
+
+	return self
 }
 
-func (self *Vm) Depth() int {
-	return self.depth
+func (self *Vm) Endl() VirtualMachine {
+	if self.logTy == LogTyPretty {
+		vmlogger.Debugln(self.logStr)
+		self.logStr = ""
+	}
+
+	return self
 }
 
-func (self *Vm) Printf(format string, v ...interface{}) VirtualMachine { return self }
-func (self *Vm) Endl() VirtualMachine                                  { return self }
+func (self *Vm) Env() Environment {
+	return self.env
+}
diff --git a/vm/vm_debug.go b/vm/vm_debug.go
deleted file mode 100644
index aa3291e66..000000000
--- a/vm/vm_debug.go
+++ /dev/null
@@ -1,983 +0,0 @@
-package vm
-
-import (
-	"fmt"
-	"math"
-	"math/big"
-
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/ethutil"
-	"github.com/ethereum/go-ethereum/state"
-)
-
-type DebugVm struct {
-	env Environment
-
-	logTy  byte
-	logStr string
-
-	err error
-
-	// Debugging
-	Dbg Debugger
-
-	BreakPoints []int64
-	Stepping    bool
-	Fn          string
-
-	Recoverable bool
-}
-
-func NewDebugVm(env Environment) *DebugVm {
-	lt := LogTyPretty
-	if ethutil.Config.Diff {
-		lt = LogTyDiff
-	}
-
-	return &DebugVm{env: env, logTy: lt, Recoverable: true}
-}
-
-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 p := Precompiled[string(me.Address())]; p != nil {
-		return self.RunPrecompiled(p, callData, closure)
-	}
-
-	if self.Recoverable {
-		// Recover from any require exception
-		defer func() {
-			if r := recover(); r != nil {
-				self.Endl()
-
-				closure.UseGas(closure.Gas)
-
-				ret = closure.Return(nil)
-
-				err = fmt.Errorf("%v", r)
-
-			}
-		}()
-	}
-
-	var (
-		op OpCode
-
-		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 uint64, to *big.Int) {
-			p := to.Uint64()
-
-			self.Printf(" ~> %v", to)
-			// Return to start
-			if p == 0 {
-				pc = 0
-			} else {
-				nop := OpCode(closure.GetOp(p))
-				if !(nop == JUMPDEST || destinations[from] != nil) {
-					panic(fmt.Sprintf("invalid jump destination (%v) %v", nop, p))
-				} else if nop == JUMP || nop == JUMPI {
-					panic(fmt.Sprintf("not allowed to JUMP(I) in to JUMP"))
-				}
-
-				pc = to.Uint64()
-
-			}
-
-			self.Endl()
-		}
-	)
-
-	vmlogger.Debugf("(%d) (%x) %x (code=%d) gas: %v (d) %x\n", self.env.Depth(), caller.Address()[:4], closure.Address(), len(code), closure.Gas, callData)
-
-	// Don't bother with the execution if there's no code.
-	if len(code) == 0 {
-		return closure.Return(nil), nil
-	}
-
-	for {
-		prevStep = step
-		// 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) {
-			if amount.Cmp(ethutil.Big0) >= 0 {
-				gas.Add(gas, amount)
-			}
-		}
-
-		addStepGasUsage(GasStep)
-
-		var newMemSize *big.Int = ethutil.Big0
-		var additionalGas *big.Int = new(big.Int)
-		// Stack Check, memory resize & gas phase
-		switch op {
-		// Stack checks only
-		case ISZERO, CALLDATALOAD, POP, JUMP, NOT: // 1
-			require(1)
-		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)
-		case SWAP1, SWAP2, SWAP3, SWAP4, SWAP5, SWAP6, SWAP7, SWAP8, SWAP9, SWAP10, SWAP11, SWAP12, SWAP13, SWAP14, SWAP15, SWAP16:
-			n := int(op - SWAP1 + 2)
-			require(n)
-		case DUP1, DUP2, DUP3, DUP4, DUP5, DUP6, DUP7, DUP8, DUP9, DUP10, DUP11, DUP12, DUP13, DUP14, DUP15, DUP16:
-			n := int(op - DUP1 + 1)
-			require(n)
-		case LOG0, LOG1, LOG2, LOG3, LOG4:
-			n := int(op - LOG0)
-			require(n + 2)
-
-			gas.Set(GasLog)
-			addStepGasUsage(new(big.Int).Mul(big.NewInt(int64(n)), GasLog))
-
-			mSize, mStart := stack.Peekn()
-			addStepGasUsage(mSize)
-
-			newMemSize = calcMemSize(mStart, mSize)
-		case EXP:
-			require(2)
-
-			gas.Set(big.NewInt(int64(len(stack.data[stack.Len()-2].Bytes()) + 1)))
-		// Gas only
-		case STOP:
-			gas.Set(ethutil.Big0)
-		case SUICIDE:
-			require(1)
-
-			gas.Set(ethutil.Big0)
-		case SLOAD:
-			require(1)
-
-			gas.Set(GasSLoad)
-		// Memory resize & Gas
-		case SSTORE:
-			require(2)
-
-			var mult *big.Int
-			y, x := stack.Peekn()
-			val := statedb.GetState(closure.Address(), x.Bytes())
-			if len(val) == 0 && len(y.Bytes()) > 0 {
-				// 0 => non 0
-				mult = ethutil.Big3
-			} else if len(val) > 0 && len(y.Bytes()) == 0 {
-				statedb.Refund(caller.Address(), GasSStoreRefund)
-
-				mult = ethutil.Big0
-			} else {
-				// non 0 => non 0 (or 0 => 0)
-				mult = ethutil.Big1
-			}
-			gas.Set(new(big.Int).Mul(mult, GasSStore))
-		case BALANCE:
-			require(1)
-			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])
-			additionalGas.Set(stack.data[stack.Len()-2])
-		case CALLDATACOPY:
-			require(2)
-
-			newMemSize = calcMemSize(stack.Peek(), stack.data[stack.Len()-3])
-			additionalGas.Set(stack.data[stack.Len()-3])
-		case CODECOPY:
-			require(3)
-
-			newMemSize = calcMemSize(stack.Peek(), stack.data[stack.Len()-3])
-			additionalGas.Set(stack.data[stack.Len()-3])
-		case EXTCODECOPY:
-			require(4)
-
-			newMemSize = calcMemSize(stack.data[stack.Len()-2], stack.data[stack.Len()-4])
-			additionalGas.Set(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])
-		}
-
-		switch op {
-		case CALLDATACOPY, CODECOPY, EXTCODECOPY:
-			additionalGas.Add(additionalGas, u256(31))
-			additionalGas.Div(additionalGas, u256(32))
-			addStepGasUsage(additionalGas)
-		case SHA3:
-			additionalGas.Add(additionalGas, u256(31))
-			additionalGas.Div(additionalGas, u256(32))
-			additionalGas.Mul(additionalGas, GasSha3Byte)
-			addStepGasUsage(additionalGas)
-		}
-
-		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)
-
-			}
-
-		}
-
-		self.Printf("(pc) %-3d -o- %-14s", pc, op.String())
-		self.Printf(" (m) %-4d (s) %-4d (g) %-3v (%v)", mem.Len(), stack.Len(), gas, closure.Gas)
-
-		if !closure.UseGas(gas) {
-			self.Endl()
-
-			tmp := new(big.Int).Set(closure.Gas)
-
-			closure.UseGas(closure.Gas)
-
-			return closure.Return(nil), OOG(gas, tmp)
-		}
-
-		mem.Resize(newMemSize.Uint64())
-
-		switch op {
-		// 0x20 range
-		case ADD:
-			x, y := stack.Popn()
-			self.Printf(" %v + %v", y, x)
-
-			base.Add(y, x)
-
-			U256(base)
-
-			self.Printf(" = %v", base)
-			// Pop result back on the stack
-			stack.Push(base)
-		case SUB:
-			x, y := stack.Popn()
-			self.Printf(" %v - %v", y, x)
-
-			base.Sub(y, x)
-
-			U256(base)
-
-			self.Printf(" = %v", base)
-			// Pop result back on the stack
-			stack.Push(base)
-		case MUL:
-			x, y := stack.Popn()
-			self.Printf(" %v * %v", y, x)
-
-			base.Mul(y, x)
-
-			U256(base)
-
-			self.Printf(" = %v", base)
-			// Pop result back on the stack
-			stack.Push(base)
-		case DIV:
-			x, y := stack.Pop(), stack.Pop()
-			self.Printf(" %v / %v", x, y)
-
-			if y.Cmp(ethutil.Big0) != 0 {
-				base.Div(x, y)
-			}
-
-			U256(base)
-
-			self.Printf(" = %v", base)
-			// Pop result back on the stack
-			stack.Push(base)
-		case SDIV:
-			x, y := S256(stack.Pop()), S256(stack.Pop())
-
-			self.Printf(" %v / %v", x, y)
-
-			if y.Cmp(ethutil.Big0) == 0 {
-				base.Set(ethutil.Big0)
-			} else {
-				n := new(big.Int)
-				if new(big.Int).Mul(x, y).Cmp(ethutil.Big0) < 0 {
-					n.SetInt64(-1)
-				} else {
-					n.SetInt64(1)
-				}
-
-				base.Div(x.Abs(x), y.Abs(y)).Mul(base, n)
-
-				U256(base)
-			}
-
-			self.Printf(" = %v", base)
-			stack.Push(base)
-		case MOD:
-			x, y := stack.Pop(), stack.Pop()
-
-			self.Printf(" %v %% %v", x, y)
-
-			if y.Cmp(ethutil.Big0) == 0 {
-				base.Set(ethutil.Big0)
-			} else {
-				base.Mod(x, y)
-			}
-
-			U256(base)
-
-			self.Printf(" = %v", base)
-			stack.Push(base)
-		case SMOD:
-			x, y := S256(stack.Pop()), S256(stack.Pop())
-
-			self.Printf(" %v %% %v", x, y)
-
-			if y.Cmp(ethutil.Big0) == 0 {
-				base.Set(ethutil.Big0)
-			} else {
-				n := new(big.Int)
-				if x.Cmp(ethutil.Big0) < 0 {
-					n.SetInt64(-1)
-				} else {
-					n.SetInt64(1)
-				}
-
-				base.Mod(x.Abs(x), y.Abs(y)).Mul(base, n)
-
-				U256(base)
-			}
-
-			self.Printf(" = %v", base)
-			stack.Push(base)
-
-		case EXP:
-			x, y := stack.Popn()
-
-			self.Printf(" %v ** %v", y, x)
-
-			base.Exp(y, x, Pow256)
-
-			U256(base)
-
-			self.Printf(" = %v", base)
-
-			stack.Push(base)
-		case SIGNEXTEND:
-			back := stack.Pop().Uint64()
-			if back < 31 {
-				bit := uint(back*8 + 7)
-				num := stack.Pop()
-				mask := new(big.Int).Lsh(ethutil.Big1, bit)
-				mask.Sub(mask, ethutil.Big1)
-				if ethutil.BitTest(num, int(bit)) {
-					num.Or(num, mask.Not(mask))
-				} else {
-					num.And(num, mask)
-				}
-
-				num = U256(num)
-
-				self.Printf(" = %v", num)
-
-				stack.Push(num)
-			}
-		case NOT:
-			base.Sub(Pow256, stack.Pop()).Sub(base, ethutil.Big1)
-
-			// Not needed
-			//base = U256(base)
-
-			stack.Push(base)
-		case LT:
-			x, y := stack.Popn()
-			self.Printf(" %v < %v", y, x)
-			// x < y
-			if y.Cmp(x) < 0 {
-				stack.Push(ethutil.BigTrue)
-			} else {
-				stack.Push(ethutil.BigFalse)
-			}
-		case GT:
-			x, y := stack.Popn()
-			self.Printf(" %v > %v", y, x)
-
-			// x > y
-			if y.Cmp(x) > 0 {
-				stack.Push(ethutil.BigTrue)
-			} else {
-				stack.Push(ethutil.BigFalse)
-			}
-
-		case SLT:
-			y, x := S256(stack.Pop()), S256(stack.Pop())
-			self.Printf(" %v < %v", y, x)
-			// x < y
-			if y.Cmp(S256(x)) < 0 {
-				stack.Push(ethutil.BigTrue)
-			} else {
-				stack.Push(ethutil.BigFalse)
-			}
-		case SGT:
-			y, x := S256(stack.Pop()), S256(stack.Pop())
-			self.Printf(" %v > %v", y, x)
-
-			// x > y
-			if y.Cmp(x) > 0 {
-				stack.Push(ethutil.BigTrue)
-			} else {
-				stack.Push(ethutil.BigFalse)
-			}
-
-		case EQ:
-			x, y := stack.Popn()
-			self.Printf(" %v == %v", y, x)
-
-			// x == y
-			if x.Cmp(y) == 0 {
-				stack.Push(ethutil.BigTrue)
-			} else {
-				stack.Push(ethutil.BigFalse)
-			}
-		case ISZERO:
-			x := stack.Pop()
-			if x.Cmp(ethutil.BigFalse) > 0 {
-				stack.Push(ethutil.BigFalse)
-			} else {
-				stack.Push(ethutil.BigTrue)
-			}
-
-			// 0x10 range
-		case AND:
-			x, y := stack.Popn()
-			self.Printf(" %v & %v", y, x)
-
-			stack.Push(base.And(y, x))
-		case OR:
-			x, y := stack.Popn()
-			self.Printf(" %v | %v", y, x)
-
-			stack.Push(base.Or(y, x))
-		case XOR:
-			x, y := stack.Popn()
-			self.Printf(" %v ^ %v", y, x)
-
-			stack.Push(base.Xor(y, x))
-		case BYTE:
-			val, th := stack.Popn()
-
-			if th.Cmp(big.NewInt(32)) < 0 {
-				byt := big.NewInt(int64(ethutil.LeftPadBytes(val.Bytes(), 32)[th.Int64()]))
-
-				base.Set(byt)
-			} else {
-				base.Set(ethutil.BigFalse)
-			}
-
-			self.Printf(" => 0x%x", base.Bytes())
-
-			stack.Push(base)
-		case ADDMOD:
-
-			x := stack.Pop()
-			y := stack.Pop()
-			z := stack.Pop()
-
-			base.Add(x, y)
-			base.Mod(base, z)
-
-			U256(base)
-
-			self.Printf(" = %v", base)
-
-			stack.Push(base)
-		case MULMOD:
-
-			x := stack.Pop()
-			y := stack.Pop()
-			z := stack.Pop()
-
-			base.Mul(x, y)
-			base.Mod(base, z)
-
-			U256(base)
-
-			self.Printf(" = %v", base)
-
-			stack.Push(base)
-
-			// 0x20 range
-		case SHA3:
-			size, offset := stack.Popn()
-			data := crypto.Sha3(mem.Get(offset.Int64(), size.Int64()))
-
-			stack.Push(ethutil.BigD(data))
-
-			self.Printf(" => %x", data)
-			// 0x30 range
-		case ADDRESS:
-			stack.Push(ethutil.BigD(closure.Address()))
-
-			self.Printf(" => %x", closure.Address())
-		case BALANCE:
-
-			addr := stack.Pop().Bytes()
-			balance := statedb.GetBalance(addr)
-
-			stack.Push(balance)
-
-			self.Printf(" => %v (%x)", balance, addr)
-		case ORIGIN:
-			origin := self.env.Origin()
-
-			stack.Push(ethutil.BigD(origin))
-
-			self.Printf(" => %x", origin)
-		case CALLER:
-			caller := closure.caller.Address()
-			stack.Push(ethutil.BigD(caller))
-
-			self.Printf(" => %x", caller)
-		case CALLVALUE:
-			stack.Push(value)
-
-			self.Printf(" => %v", value)
-		case CALLDATALOAD:
-			var (
-				offset  = stack.Pop()
-				data    = make([]byte, 32)
-				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, callData[offset.Int64():length.Int64()])
-			}
-
-			self.Printf(" => 0x%x", data)
-
-			stack.Push(ethutil.BigD(data))
-		case CALLDATASIZE:
-			l := int64(len(callData))
-			stack.Push(big.NewInt(l))
-
-			self.Printf(" => %d", l)
-		case CALLDATACOPY:
-			var (
-				size = uint64(len(callData))
-				mOff = stack.Pop().Uint64()
-				cOff = stack.Pop().Uint64()
-				l    = stack.Pop().Uint64()
-			)
-
-			if cOff > size {
-				cOff = 0
-				l = 0
-			} else if cOff+l > size {
-				l = 0
-			}
-
-			code := callData[cOff : cOff+l]
-
-			mem.Set(mOff, l, code)
-
-			self.Printf(" => [%v, %v, %v] %x", mOff, cOff, l, callData[cOff:cOff+l])
-		case CODESIZE, EXTCODESIZE:
-			var code []byte
-			if op == EXTCODESIZE {
-				addr := stack.Pop().Bytes()
-
-				code = statedb.GetCode(addr)
-			} else {
-				code = closure.Code
-			}
-
-			l := big.NewInt(int64(len(code)))
-			stack.Push(l)
-
-			self.Printf(" => %d", l)
-		case CODECOPY, EXTCODECOPY:
-			var code []byte
-			if op == EXTCODECOPY {
-				code = statedb.GetCode(stack.Pop().Bytes())
-			} else {
-				code = closure.Code
-			}
-
-			var (
-				size = uint64(len(code))
-				mOff = stack.Pop().Uint64()
-				cOff = stack.Pop().Uint64()
-				l    = stack.Pop().Uint64()
-			)
-
-			if cOff > size {
-				cOff = 0
-				l = 0
-			} else if cOff+l > size {
-				l = uint64(math.Min(float64(cOff+l), float64(size)))
-			}
-			codeCopy := code[cOff : cOff+l]
-
-			mem.Set(mOff, l, codeCopy)
-
-			self.Printf(" => [%v, %v, %v] %x", mOff, cOff, l, codeCopy)
-		case GASPRICE:
-			stack.Push(closure.Price)
-
-			self.Printf(" => %v", closure.Price)
-
-			// 0x40 range
-		case PREVHASH:
-			prevHash := self.env.PrevHash()
-
-			stack.Push(ethutil.BigD(prevHash))
-
-			self.Printf(" => 0x%x", prevHash)
-		case COINBASE:
-			coinbase := self.env.Coinbase()
-
-			stack.Push(ethutil.BigD(coinbase))
-
-			self.Printf(" => 0x%x", coinbase)
-		case TIMESTAMP:
-			time := self.env.Time()
-
-			stack.Push(big.NewInt(time))
-
-			self.Printf(" => 0x%x", time)
-		case NUMBER:
-			number := self.env.BlockNumber()
-
-			stack.Push(number)
-
-			self.Printf(" => 0x%x", number.Bytes())
-		case DIFFICULTY:
-			difficulty := self.env.Difficulty()
-
-			stack.Push(difficulty)
-
-			self.Printf(" => 0x%x", difficulty.Bytes())
-		case GASLIMIT:
-			stack.Push(self.env.GasLimit())
-
-			// 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)
-			a := uint64(op - PUSH1 + 1)
-			//pc.Add(pc, ethutil.Big1)
-			val := ethutil.BigD(closure.GetRangeValue(pc+1, a))
-			// Push value to stack
-			stack.Push(val)
-			pc += a
-			//pc.Add(pc, a.Sub(a, big.NewInt(1)))
-
-			step += int(op) - int(PUSH1) + 1
-
-			self.Printf(" => 0x%x", val.Bytes())
-		case POP:
-			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)
-
-			self.Printf(" => [%d] 0x%x", n, stack.Peek().Bytes())
-		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)
-
-			self.Printf(" => [%d] %x [0] %x", n, x.Bytes(), y.Bytes())
-		case LOG0, LOG1, LOG2, LOG3, LOG4:
-			n := int(op - LOG0)
-			topics := make([][]byte, n)
-			mSize, mStart := stack.Popn()
-			for i := 0; i < n; i++ {
-				topics[i] = ethutil.LeftPadBytes(stack.Pop().Bytes(), 32)
-			}
-
-			data := mem.Geti(mStart.Int64(), mSize.Int64())
-			log := &Log{closure.Address(), topics, data}
-			self.env.AddLog(log)
-
-			self.Printf(" => %v", log)
-		case MLOAD:
-			offset := stack.Pop()
-			val := ethutil.BigD(mem.Get(offset.Int64(), 32))
-			stack.Push(val)
-
-			self.Printf(" => 0x%x", val.Bytes())
-		case MSTORE: // Store the value at stack top-1 in to memory at location stack top
-			// Pop value of the stack
-			val, mStart := stack.Popn()
-			mem.Set(mStart.Uint64(), 32, ethutil.BigToBytes(val, 256))
-
-			self.Printf(" => 0x%x", val)
-		case MSTORE8:
-			off := stack.Pop()
-			val := stack.Pop()
-
-			mem.store[off.Int64()] = byte(val.Int64() & 0xff)
-
-			self.Printf(" => [%v] 0x%x", off, val)
-		case SLOAD:
-			loc := stack.Pop()
-			val := ethutil.BigD(statedb.GetState(closure.Address(), loc.Bytes()))
-			stack.Push(val)
-
-			self.Printf(" {0x%x : 0x%x}", loc.Bytes(), val.Bytes())
-		case SSTORE:
-			val, loc := stack.Popn()
-			statedb.SetState(closure.Address(), loc.Bytes(), val)
-
-			closure.message.AddStorageChange(loc.Bytes())
-
-			self.Printf(" {0x%x : 0x%x}", loc.Bytes(), val.Bytes())
-		case JUMP:
-			jump(pc, stack.Pop())
-
-			continue
-		case JUMPI:
-			cond, pos := stack.Popn()
-
-			if cond.Cmp(ethutil.BigTrue) >= 0 {
-				jump(pc, pos)
-
-				continue
-			}
-
-		case JUMPDEST:
-		case 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()
-				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
-			n := statedb.GetNonce(closure.Address())
-			addr := crypto.CreateAddress(closure.Address(), n)
-			statedb.SetNonce(closure.Address(), n+1)
-
-			self.Printf(" (*) %x", addr).Endl()
-
-			closure.UseGas(closure.Gas)
-
-			ret, err, ref := self.env.Create(closure, addr, input, gas, price, value)
-			if err != nil {
-				stack.Push(ethutil.BigFalse)
-
-				self.Printf("CREATE err %v", err)
-			} else {
-				// gas < len(ret) * CreateDataGas == NO_CODE
-				dataGas := big.NewInt(int64(len(ret)))
-				dataGas.Mul(dataGas, GasCreateByte)
-				if closure.UseGas(dataGas) {
-					ref.SetCode(ret)
-					msg.Output = ret
-				}
-
-				stack.Push(ethutil.BigD(addr))
-			}
-
-			self.Endl()
-
-			// Debug hook
-			if self.Dbg != nil {
-				self.Dbg.SetCode(closure.Code)
-			}
-		case CALL, CALLCODE:
-			self.Endl()
-
-			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 (
-				ret []byte
-				err error
-			)
-			if op == CALLCODE {
-				ret, err = self.env.CallCode(closure, addr.Bytes(), args, gas, price, value)
-			} else {
-				ret, err = self.env.Call(closure, addr.Bytes(), 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.Uint64(), retSize.Uint64(), ret)
-			}
-			self.Printf("resume %x (%v)", closure.Address(), closure.Gas)
-
-			// Debug hook
-			if self.Dbg != nil {
-				self.Dbg.SetCode(closure.Code)
-			}
-
-		case RETURN:
-			size, offset := stack.Popn()
-			ret := mem.Get(offset.Int64(), size.Int64())
-
-			self.Printf(" => [%v, %v] (%d) 0x%x", offset, size, len(ret), ret).Endl()
-
-			return closure.Return(ret), nil
-		case SUICIDE:
-			receiver := statedb.GetOrNewStateObject(stack.Pop().Bytes())
-			balance := statedb.GetBalance(closure.Address())
-
-			self.Printf(" => (%x) %v", receiver.Address()[:4], balance)
-
-			receiver.AddAmount(balance)
-			statedb.Delete(closure.Address())
-
-			fallthrough
-		case STOP: // Stop the closure
-			self.Endl()
-
-			return closure.Return(nil), nil
-		default:
-			vmlogger.Debugf("(pc) %-3v Invalid opcode %x\n", pc, op)
-
-			closure.ReturnGas(big.NewInt(1), nil)
-
-			return closure.Return(nil), fmt.Errorf("Invalid opcode %x", op)
-		}
-
-		pc++
-
-		self.Endl()
-
-		if self.Dbg != nil {
-			for _, instrNo := range self.Dbg.BreakPoints() {
-				if pc == uint64(instrNo) {
-					self.Stepping = true
-
-					if !self.Dbg.BreakHook(prevStep, op, mem, stack, statedb.GetStateObject(closure.Address())) {
-						return nil, nil
-					}
-				} else if self.Stepping {
-					if !self.Dbg.StepHook(prevStep, op, mem, stack, statedb.GetStateObject(closure.Address())) {
-						return nil, nil
-					}
-				}
-			}
-		}
-
-	}
-}
-
-func (self *DebugVm) RunPrecompiled(p *PrecompiledAccount, callData []byte, closure *Closure) (ret []byte, err error) {
-	gas := p.Gas(len(callData))
-	if closure.UseGas(gas) {
-		ret = p.Call(callData)
-		self.Printf("NATIVE_FUNC => %x", ret)
-		self.Endl()
-
-		return closure.Return(ret), nil
-	} else {
-		self.Endl()
-
-		tmp := new(big.Int).Set(closure.Gas)
-
-		closure.UseGas(closure.Gas)
-
-		return closure.Return(nil), OOG(gas, tmp)
-	}
-}
-
-func (self *DebugVm) Printf(format string, v ...interface{}) VirtualMachine {
-	if self.logTy == LogTyPretty {
-		self.logStr += fmt.Sprintf(format, v...)
-	}
-
-	return self
-}
-
-func (self *DebugVm) Endl() VirtualMachine {
-	if self.logTy == LogTyPretty {
-		vmlogger.Debugln(self.logStr)
-		self.logStr = ""
-	}
-
-	return self
-}
-
-func (self *DebugVm) Env() Environment {
-	return self.env
-}
diff --git a/vm/vm_jit.go b/vm/vm_jit.go
new file mode 100644
index 000000000..38cab57da
--- /dev/null
+++ b/vm/vm_jit.go
@@ -0,0 +1,371 @@
+// +build evmjit
+
+package vm
+
+/*
+
+void* evmjit_create();
+int   evmjit_run(void* _jit, void* _data, void* _env);
+void  evmjit_destroy(void* _jit);
+
+// Shared library evmjit (e.g. libevmjit.so) is expected to be installed in /usr/local/lib
+// More: https://github.com/ethereum/evmjit
+#cgo LDFLAGS: -levmjit
+*/
+import "C"
+
+import (
+	"bytes"
+	"errors"
+	"fmt"
+	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/ethereum/go-ethereum/state"
+	"math/big"
+	"unsafe"
+)
+
+type JitVm struct {
+	env        Environment
+	me         ContextRef
+	callerAddr []byte
+	price      *big.Int
+	data       RuntimeData
+}
+
+type i256 [32]byte
+
+type RuntimeData struct {
+	gas          int64
+	gasPrice     int64
+	callData     *byte
+	callDataSize uint64
+	address      i256
+	caller       i256
+	origin       i256
+	callValue    i256
+	coinBase     i256
+	difficulty   i256
+	gasLimit     i256
+	number       uint64
+	timestamp    int64
+	code         *byte
+	codeSize     uint64
+}
+
+func hash2llvm(h []byte) i256 {
+	var m i256
+	copy(m[len(m)-len(h):], h) // right aligned copy
+	return m
+}
+
+func llvm2hash(m *i256) []byte {
+	return C.GoBytes(unsafe.Pointer(m), C.int(len(m)))
+}
+
+func llvm2hashRef(m *i256) []byte {
+	return (*[1 << 30]byte)(unsafe.Pointer(m))[:len(m):len(m)]
+}
+
+func address2llvm(addr []byte) i256 {
+	n := hash2llvm(addr)
+	bswap(&n)
+	return n
+}
+
+// bswap swap bytes of the 256-bit integer on LLVM side
+// TODO: Do not change memory on LLVM side, that can conflict with memory access optimizations
+func bswap(m *i256) *i256 {
+	for i, l := 0, len(m); i < l/2; i++ {
+		m[i], m[l-i-1] = m[l-i-1], m[i]
+	}
+	return m
+}
+
+func trim(m []byte) []byte {
+	skip := 0
+	for i := 0; i < len(m); i++ {
+		if m[i] == 0 {
+			skip++
+		} else {
+			break
+		}
+	}
+	return m[skip:]
+}
+
+func getDataPtr(m []byte) *byte {
+	var p *byte
+	if len(m) > 0 {
+		p = &m[0]
+	}
+	return p
+}
+
+func big2llvm(n *big.Int) i256 {
+	m := hash2llvm(n.Bytes())
+	bswap(&m)
+	return m
+}
+
+func llvm2big(m *i256) *big.Int {
+	n := big.NewInt(0)
+	for i := 0; i < len(m); i++ {
+		b := big.NewInt(int64(m[i]))
+		b.Lsh(b, uint(i)*8)
+		n.Add(n, b)
+	}
+	return n
+}
+
+// llvm2bytesRef creates a []byte slice that references byte buffer on LLVM side (as of that not controller by GC)
+// User must asure that referenced memory is available to Go until the data is copied or not needed any more
+func llvm2bytesRef(data *byte, length uint64) []byte {
+	if length == 0 {
+		return nil
+	}
+	if data == nil {
+		panic("Unexpected nil data pointer")
+	}
+	return (*[1 << 30]byte)(unsafe.Pointer(data))[:length:length]
+}
+
+func untested(condition bool, message string) {
+	if condition {
+		panic("Condition `" + message + "` tested. Remove assert.")
+	}
+}
+
+func assert(condition bool, message string) {
+	if !condition {
+		panic("Assert `" + message + "` failed!")
+	}
+}
+
+func NewJitVm(env Environment) *JitVm {
+	return &JitVm{env: env}
+}
+
+func (self *JitVm) Run(me, caller ContextRef, code []byte, value, gas, price *big.Int, callData []byte) (ret []byte, err error) {
+	// TODO: depth is increased but never checked by VM. VM should not know about it at all.
+	self.env.SetDepth(self.env.Depth() + 1)
+
+	// TODO: Move it to Env.Call() or sth
+	if Precompiled[string(me.Address())] != nil {
+		// if it's address of precopiled contract
+		// fallback to standard VM
+		stdVm := New(self.env)
+		return stdVm.Run(me, caller, code, value, gas, price, callData)
+	}
+
+	if self.me != nil {
+		panic("JitVm.Run() can be called only once per JitVm instance")
+	}
+
+	self.me = me
+	self.callerAddr = caller.Address()
+	self.price = price
+
+	self.data.gas = gas.Int64()
+	self.data.gasPrice = price.Int64()
+	self.data.callData = getDataPtr(callData)
+	self.data.callDataSize = uint64(len(callData))
+	self.data.address = address2llvm(self.me.Address())
+	self.data.caller = address2llvm(caller.Address())
+	self.data.origin = address2llvm(self.env.Origin())
+	self.data.callValue = big2llvm(value)
+	self.data.coinBase = address2llvm(self.env.Coinbase())
+	self.data.difficulty = big2llvm(self.env.Difficulty())
+	self.data.gasLimit = big2llvm(self.env.GasLimit())
+	self.data.number = self.env.BlockNumber().Uint64()
+	self.data.timestamp = self.env.Time()
+	self.data.code = getDataPtr(code)
+	self.data.codeSize = uint64(len(code))
+
+	jit := C.evmjit_create()
+	retCode := C.evmjit_run(jit, unsafe.Pointer(&self.data), unsafe.Pointer(self))
+
+	if retCode < 0 {
+		err = errors.New("OOG from JIT")
+		gas.SetInt64(0) // Set gas to 0, JIT does not bother
+	} else {
+		gas.SetInt64(self.data.gas)
+		if retCode == 1 { // RETURN
+			ret = C.GoBytes(unsafe.Pointer(self.data.callData), C.int(self.data.callDataSize))
+		} else if retCode == 2 { // SUICIDE
+			// TODO: Suicide support logic should be moved to Env to be shared by VM implementations
+			state := self.Env().State()
+			receiverAddr := llvm2hashRef(bswap(&self.data.address))
+			receiver := state.GetOrNewStateObject(receiverAddr)
+			balance := state.GetBalance(me.Address())
+			receiver.AddAmount(balance)
+			state.Delete(me.Address())
+		}
+	}
+	
+	C.evmjit_destroy(jit);
+	return
+}
+
+func (self *JitVm) Printf(format string, v ...interface{}) VirtualMachine {
+	return self
+}
+
+func (self *JitVm) Endl() VirtualMachine {
+	return self
+}
+
+func (self *JitVm) Env() Environment {
+	return self.env
+}
+
+//export env_sha3
+func env_sha3(dataPtr *byte, length uint64, resultPtr unsafe.Pointer) {
+	data := llvm2bytesRef(dataPtr, length)
+	hash := crypto.Sha3(data)
+	result := (*i256)(resultPtr)
+	*result = hash2llvm(hash)
+}
+
+//export env_sstore
+func env_sstore(vmPtr unsafe.Pointer, indexPtr unsafe.Pointer, valuePtr unsafe.Pointer) {
+	vm := (*JitVm)(vmPtr)
+	index := llvm2hash(bswap((*i256)(indexPtr)))
+	value := llvm2hash(bswap((*i256)(valuePtr)))
+	value = trim(value)
+	if len(value) == 0 {
+		prevValue := vm.env.State().GetState(vm.me.Address(), index)
+		if len(prevValue) != 0 {
+			vm.Env().State().Refund(vm.callerAddr, GasSStoreRefund)
+		}
+	}
+
+	vm.env.State().SetState(vm.me.Address(), index, value)
+}
+
+//export env_sload
+func env_sload(vmPtr unsafe.Pointer, indexPtr unsafe.Pointer, resultPtr unsafe.Pointer) {
+	vm := (*JitVm)(vmPtr)
+	index := llvm2hash(bswap((*i256)(indexPtr)))
+	value := vm.env.State().GetState(vm.me.Address(), index)
+	result := (*i256)(resultPtr)
+	*result = hash2llvm(value)
+	bswap(result)
+}
+
+//export env_balance
+func env_balance(_vm unsafe.Pointer, _addr unsafe.Pointer, _result unsafe.Pointer) {
+	vm := (*JitVm)(_vm)
+	addr := llvm2hash((*i256)(_addr))
+	balance := vm.Env().State().GetBalance(addr)
+	result := (*i256)(_result)
+	*result = big2llvm(balance)
+}
+
+//export env_blockhash
+func env_blockhash(_vm unsafe.Pointer, _number unsafe.Pointer, _result unsafe.Pointer) {
+	vm := (*JitVm)(_vm)
+	number := llvm2big((*i256)(_number))
+	result := (*i256)(_result)
+
+	currNumber := vm.Env().BlockNumber()
+	limit := big.NewInt(0).Sub(currNumber, big.NewInt(256))
+	if number.Cmp(limit) >= 0 && number.Cmp(currNumber) < 0 {
+		hash := vm.Env().GetHash(uint64(number.Int64()))
+		*result = hash2llvm(hash)
+	} else {
+		*result = i256{}
+	}
+}
+
+//export env_call
+func env_call(_vm unsafe.Pointer, _gas unsafe.Pointer, _receiveAddr unsafe.Pointer, _value unsafe.Pointer, inDataPtr unsafe.Pointer, inDataLen uint64, outDataPtr *byte, outDataLen uint64, _codeAddr unsafe.Pointer) bool {
+	vm := (*JitVm)(_vm)
+
+	//fmt.Printf("env_call (depth %d)\n", vm.Env().Depth())
+
+	defer func() {
+		if r := recover(); r != nil {
+			fmt.Printf("Recovered in env_call (depth %d, out %p %d): %s\n", vm.Env().Depth(), outDataPtr, outDataLen, r)
+		}
+	}()
+
+	balance := vm.Env().State().GetBalance(vm.me.Address())
+	value := llvm2big((*i256)(_value))
+
+	if balance.Cmp(value) >= 0 {
+		receiveAddr := llvm2hash((*i256)(_receiveAddr))
+		inData := C.GoBytes(inDataPtr, C.int(inDataLen))
+		outData := llvm2bytesRef(outDataPtr, outDataLen)
+		codeAddr := llvm2hash((*i256)(_codeAddr))
+		llvmGas := (*i256)(_gas)
+		gas := llvm2big(llvmGas)
+		var out []byte
+		var err error
+		if bytes.Equal(codeAddr, receiveAddr) {
+			out, err = vm.env.Call(vm.me, codeAddr, inData, gas, vm.price, value)
+		} else {
+			out, err = vm.env.CallCode(vm.me, codeAddr, inData, gas, vm.price, value)
+		}
+		*llvmGas = big2llvm(gas)
+		if err == nil {
+			copy(outData, out)
+			return true
+		}
+	}
+
+	return false
+}
+
+//export env_create
+func env_create(_vm unsafe.Pointer, _gas unsafe.Pointer, _value unsafe.Pointer, initDataPtr unsafe.Pointer, initDataLen uint64, _result unsafe.Pointer) {
+	vm := (*JitVm)(_vm)
+
+	value := llvm2big((*i256)(_value))
+	initData := C.GoBytes(initDataPtr, C.int(initDataLen)) // TODO: Unnecessary if low balance
+	result := (*i256)(_result)
+	*result = i256{}
+
+	llvmGas := (*i256)(_gas)
+	gas := llvm2big(llvmGas)
+
+	ret, suberr, ref := vm.env.Create(vm.me, nil, initData, gas, vm.price, value)
+	if suberr == nil {
+		dataGas := big.NewInt(int64(len(ret))) // TODO: Nto the best design. env.Create can do it, it has the reference to gas counter
+		dataGas.Mul(dataGas, GasCreateByte)
+		gas.Sub(gas, dataGas)
+		*result = hash2llvm(ref.Address())
+	}
+	*llvmGas = big2llvm(gas)
+}
+
+//export env_log
+func env_log(_vm unsafe.Pointer, dataPtr unsafe.Pointer, dataLen uint64, _topic1 unsafe.Pointer, _topic2 unsafe.Pointer, _topic3 unsafe.Pointer, _topic4 unsafe.Pointer) {
+	vm := (*JitVm)(_vm)
+
+	data := C.GoBytes(dataPtr, C.int(dataLen))
+
+	topics := make([][]byte, 0, 4)
+	if _topic1 != nil {
+		topics = append(topics, llvm2hash((*i256)(_topic1)))
+	}
+	if _topic2 != nil {
+		topics = append(topics, llvm2hash((*i256)(_topic2)))
+	}
+	if _topic3 != nil {
+		topics = append(topics, llvm2hash((*i256)(_topic3)))
+	}
+	if _topic4 != nil {
+		topics = append(topics, llvm2hash((*i256)(_topic4)))
+	}
+
+	vm.Env().AddLog(state.NewLog(vm.me.Address(), topics, data))
+}
+
+//export env_extcode
+func env_extcode(_vm unsafe.Pointer, _addr unsafe.Pointer, o_size *uint64) *byte {
+	vm := (*JitVm)(_vm)
+	addr := llvm2hash((*i256)(_addr))
+	code := vm.Env().State().GetCode(addr)
+	*o_size = uint64(len(code))
+	return getDataPtr(code)
+}
diff --git a/vm/vm_jit_fake.go b/vm/vm_jit_fake.go
new file mode 100644
index 000000000..d6b5be45b
--- /dev/null
+++ b/vm/vm_jit_fake.go
@@ -0,0 +1,10 @@
+// +build !evmjit
+
+package vm
+
+import "fmt"
+
+func NewJitVm(env Environment) VirtualMachine {
+	fmt.Printf("Warning! EVM JIT not enabled.\n")
+	return New(env)
+}