Merge branch 'develop' into jsonrpc

Conflicts:
	rpc/ws/server.go

3 files changed, 26 insertions, 7 deletions

diff --git a/vm/common.go b/vm/common.go
index ff187001f..45a7187a9 100644
--- a/vm/common.go
+++ b/vm/common.go
@@ -18,6 +18,18 @@ const (
 	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)
diff --git a/vm/environment.go b/vm/environment.go
index 8ec13ee41..8507e248f 100644
--- a/vm/environment.go
+++ b/vm/environment.go
@@ -22,6 +22,8 @@ type Environment interface {
 	Transfer(from, to Account, amount *big.Int) error
 	AddLog(state.Log)
 
+	VmType() Type
+
 	Depth() int
 	SetDepth(i int)
 
diff --git a/vm/vm.go b/vm/vm.go
index 37e4249f5..2b8c90428 100644
--- a/vm/vm.go
+++ b/vm/vm.go
@@ -510,13 +510,13 @@ func (self *Vm) Run(me, caller ContextRef, code []byte, value, gas, price *big.I
 		case GASPRICE:
 			stack.Push(context.Price)
 
-			self.Printf(" => %v", context.Price)
+			self.Printf(" => %x", context.Price)
 
 			// 0x40 range
 		case BLOCKHASH:
 			num := stack.Pop()
 
-			n := U256(new(big.Int).Sub(self.env.BlockNumber(), ethutil.Big257))
+			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 {
@@ -634,6 +634,8 @@ func (self *Vm) Run(me, caller ContextRef, code []byte, value, gas, price *big.I
 				continue
 			}
 
+			self.Printf(" ~> false")
+
 		case JUMPDEST:
 		case PC:
 			stack.Push(big.NewInt(int64(pc)))
@@ -641,6 +643,8 @@ func (self *Vm) Run(me, caller ContextRef, code []byte, value, gas, price *big.I
 			stack.Push(big.NewInt(int64(mem.Len())))
 		case GAS:
 			stack.Push(context.Gas)
+
+			self.Printf(" => %x", context.Gas)
 			// 0x60 range
 		case CREATE:
 
@@ -651,6 +655,7 @@ func (self *Vm) Run(me, caller ContextRef, code []byte, value, gas, price *big.I
 				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)
@@ -671,7 +676,6 @@ func (self *Vm) Run(me, caller ContextRef, code []byte, value, gas, price *big.I
 
 				stack.Push(ethutil.BigD(addr))
 
-				self.Printf(" (*) %x", addr)
 			}
 
 			// Debug hook
@@ -679,8 +683,6 @@ func (self *Vm) Run(me, caller ContextRef, code []byte, value, gas, price *big.I
 				self.Dbg.SetCode(context.Code)
 			}
 		case CALL, CALLCODE:
-			self.Endl()
-
 			gas := stack.Pop()
 			// Pop gas and value of the stack.
 			value, addr := stack.Popn()
@@ -689,6 +691,9 @@ func (self *Vm) Run(me, caller ContextRef, code []byte, value, gas, price *big.I
 			// 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())
 
@@ -697,9 +702,9 @@ func (self *Vm) Run(me, caller ContextRef, code []byte, value, gas, price *big.I
 				err error
 			)
 			if op == CALLCODE {
-				ret, err = self.env.CallCode(context, addr.Bytes(), args, gas, price, value)
+				ret, err = self.env.CallCode(context, address, args, gas, price, value)
 			} else {
-				ret, err = self.env.Call(context, addr.Bytes(), args, gas, price, value)
+				ret, err = self.env.Call(context, address, args, gas, price, value)
 			}
 
 			if err != nil {