From 9845029a7535672746139084138f3e894e604e44 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Tue, 20 Jan 2015 15:49:12 +0100
Subject: StdVm by default

---
 vm/vm.go     | 6 ++++--
 vm/vm_jit.go | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'vm')

diff --git a/vm/vm.go b/vm/vm.go
index 6aa39797e..37e4249f5 100644
--- a/vm/vm.go
+++ b/vm/vm.go
@@ -17,7 +17,6 @@ type Vm struct {
 
 	err error
 
-	// Debugging
 	Dbg Debugger
 
 	BreakPoints []int64
@@ -27,7 +26,7 @@ type Vm struct {
 	Recoverable bool
 }
 
-func NewVm(env Environment) *Vm {
+func New(env Environment) *Vm {
 	lt := LogTyPretty
 	if ethutil.Config.Diff {
 		lt = LogTyDiff
@@ -111,6 +110,9 @@ func (self *Vm) Run(me, caller ContextRef, code []byte, value, gas, price *big.I
 		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)
 
diff --git a/vm/vm_jit.go b/vm/vm_jit.go
index 1cb9652af..0882bcf0c 100644
--- a/vm/vm_jit.go
+++ b/vm/vm_jit.go
@@ -8,7 +8,7 @@ type JitVm struct {
 }
 
 func NewJitVm(env Environment) *JitVm {
-	backupVm := NewVm(env)
+	backupVm := New(env)
 	return &JitVm{env: env, backup: backupVm}
 }
 
-- 
cgit v1.2.3