diff options
| author | obscuren <geffobscura@gmail.com> | 2014-12-18 07:12:51 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-12-18 07:12:51 +0800 |
| commit | e6fdf0c9f7564b8b08cf428e03af66fc423adcc1 (patch) | |
| tree | 14fafd42083a9a5d57005b614740294ae0525bef /vm/vm_debug.go | |
| parent | 52b54631a47dfa46742635be178f2f8d33dd9f41 (diff) | |
| parent | 4dbdcaecb117d7e1fcaf0869f5d4602312552991 (diff) | |
| download | dexon-e6fdf0c9f7564b8b08cf428e03af66fc423adcc1.tar dexon-e6fdf0c9f7564b8b08cf428e03af66fc423adcc1.tar.gz dexon-e6fdf0c9f7564b8b08cf428e03af66fc423adcc1.tar.bz2 dexon-e6fdf0c9f7564b8b08cf428e03af66fc423adcc1.tar.lz dexon-e6fdf0c9f7564b8b08cf428e03af66fc423adcc1.tar.xz dexon-e6fdf0c9f7564b8b08cf428e03af66fc423adcc1.tar.zst dexon-e6fdf0c9f7564b8b08cf428e03af66fc423adcc1.zip | |
Merge branch 'develop' into poc8
Diffstat (limited to 'vm/vm_debug.go')
| -rw-r--r-- | vm/vm_debug.go | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/vm/vm_debug.go b/vm/vm_debug.go index 8af1979b1..9da832a79 100644 --- a/vm/vm_debug.go +++ b/vm/vm_debug.go @@ -48,9 +48,8 @@ func (self *DebugVm) Run(me, caller ClosureRef, code []byte, value, gas, price * }) closure := NewClosure(msg, caller, me, code, gas, price) - if self.env.Depth() == MaxCallDepth { - //closure.UseGas(gas) - return closure.Return(nil), DepthError{} + if p := Precompiled[string(me.Address())]; p != nil { + return self.RunPrecompiled(p, callData, closure) } if self.Recoverable { @@ -941,6 +940,25 @@ func (self *DebugVm) Run(me, caller ClosureRef, code []byte, value, gas, price * } } +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...) |