VmDebug => StdVm

89c69a1d · obscuren · 06bfe19f · 89c69a1d · 89c69a1d · 06bfe19f
Commit 89c69a1d authored Jan 19, 2015 by obscuren
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 951 additions and 990 deletions

common.go vm/common.go +2 -3

vm.go vm/vm.go +945 -22

vm_debug.go vm/vm_debug.go +0 -961

vm_jit.go vm/vm_jit.go +4 -4

No files found.
--- a/vm/common.go
+++ b/vm/common.go
@@ -9,11 +9,10 @@ import (

 var vmlogger = logger.NewLogger("VM")

-type Type int
+type Type byte

 const (
-	StandardVmTy Type = iota
-	DebugVmTy
+	StdVmTy Type = iota
 	JitVmTy

 	MaxVmTy

--- a/vm/vm.go
+++ b/vm/vm.go
--- a/vm/vm_debug.go
+++ b/vm/vm_debug.go
--- a/vm/vm_jit.go
+++ b/vm/vm_jit.go
@@ -3,12 +3,12 @@ package vm
 import "math/big"

 type JitVm struct {
-	env Environment
-	backup *DebugVm
+	env    Environment
+	backup *Vm
 }

 func NewJitVm(env Environment) *JitVm {
-	backupVm := NewDebugVm(env)
+	backupVm := NewVm(env)
 	return &JitVm{env: env, backup: backupVm}
 }

@@ -28,4 +28,4 @@ func (self *JitVm) Env() Environment {
 	return self.env
 }

-//go is nice
\ No newline at end of file
+//go is nice