aboutsummaryrefslogtreecommitdiffstats
path: root/vm
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-10-23 05:39:15 +0800
committerobscuren <geffobscura@gmail.com>2014-10-23 05:39:15 +0800
commit51ecab6967a15b82f9285cd0ffd3352607dc8612 (patch)
treee2ae47bd0ac378440e4cf501089efc175c20927b /vm
parent037039cacedc1396d7863e6f3b3fc80e0435fc1a (diff)
downloaddexon-51ecab6967a15b82f9285cd0ffd3352607dc8612.tar
dexon-51ecab6967a15b82f9285cd0ffd3352607dc8612.tar.gz
dexon-51ecab6967a15b82f9285cd0ffd3352607dc8612.tar.bz2
dexon-51ecab6967a15b82f9285cd0ffd3352607dc8612.tar.lz
dexon-51ecab6967a15b82f9285cd0ffd3352607dc8612.tar.xz
dexon-51ecab6967a15b82f9285cd0ffd3352607dc8612.tar.zst
dexon-51ecab6967a15b82f9285cd0ffd3352607dc8612.zip
Do not set error on recover
Diffstat (limited to 'vm')
-rw-r--r--vm/vm_debug.go5
1 files changed, 3 insertions, 2 deletions
diff --git a/vm/vm_debug.go b/vm/vm_debug.go
index 8773df087..acdeb4be9 100644
--- a/vm/vm_debug.go
+++ b/vm/vm_debug.go
@@ -82,7 +82,8 @@ func (self *DebugVm) RunClosure(closure *Closure) (ret []byte, err error) {
self.Endl()
ret = closure.Return(nil)
- err = fmt.Errorf("%v", r)
+ // No error should be set. Recover is used with require
+ // Is this too error prone?
}
}()
}
@@ -106,7 +107,7 @@ func (self *DebugVm) RunClosure(closure *Closure) (ret []byte, err error) {
step++
// Get the memory location of pc
- op := OpCode(closure.Get(pc).Uint())
+ op = OpCode(closure.Get(pc).Uint())
// XXX Leave this Println intact. Don't change this to the log system.
// Used for creating diffs between implementations