diff options
| author | obscuren <geffobscura@gmail.com> | 2014-12-19 07:19:02 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-12-19 07:19:02 +0800 |
| commit | 6e24b1587de95b45fe0d7623528bb2f5a48e9823 (patch) | |
| tree | cfbc3922dec2bb088f3d85dd9f2a735a250264d1 /vm/vm_debug.go | |
| parent | 22d29a6d52ade3ebcd4ecb341e3f5eafddb8e17b (diff) | |
| parent | 59ef6e36931c980ba15babfb3680514635faebf6 (diff) | |
| download | dexon-6e24b1587de95b45fe0d7623528bb2f5a48e9823.tar dexon-6e24b1587de95b45fe0d7623528bb2f5a48e9823.tar.gz dexon-6e24b1587de95b45fe0d7623528bb2f5a48e9823.tar.bz2 dexon-6e24b1587de95b45fe0d7623528bb2f5a48e9823.tar.lz dexon-6e24b1587de95b45fe0d7623528bb2f5a48e9823.tar.xz dexon-6e24b1587de95b45fe0d7623528bb2f5a48e9823.tar.zst dexon-6e24b1587de95b45fe0d7623528bb2f5a48e9823.zip | |
Merge branch 'develop' into poc8
Diffstat (limited to 'vm/vm_debug.go')
| -rw-r--r-- | vm/vm_debug.go | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/vm/vm_debug.go b/vm/vm_debug.go index 708aada5b..fd16a3895 100644 --- a/vm/vm_debug.go +++ b/vm/vm_debug.go @@ -181,7 +181,6 @@ func (self *DebugVm) Run(me, caller ClosureRef, code []byte, value, gas, price * var mult *big.Int y, x := stack.Peekn() - //val := closure.GetStorage(x) val := statedb.GetState(closure.Address(), x.Bytes()) if len(val) == 0 && len(y.Bytes()) > 0 { // 0 => non 0 @@ -714,8 +713,7 @@ func (self *DebugVm) Run(me, caller ClosureRef, code []byte, value, gas, price * //a := big.NewInt(int64(op) - int64(PUSH1) + 1) a := uint64(op - PUSH1 + 1) //pc.Add(pc, ethutil.Big1) - data := closure.GetRangeValue(pc+1, a) - val := ethutil.BigD(data.Bytes()) + val := ethutil.BigD(closure.GetRangeValue(pc+1, a)) // Push value to stack stack.Push(val) pc += a @@ -723,7 +721,7 @@ func (self *DebugVm) Run(me, caller ClosureRef, code []byte, value, gas, price * step += int(op) - int(PUSH1) + 1 - self.Printf(" => 0x%x", data.Bytes()) + self.Printf(" => 0x%x", val.Bytes()) case POP: stack.Pop() case DUP1, DUP2, DUP3, DUP4, DUP5, DUP6, DUP7, DUP8, DUP9, DUP10, DUP11, DUP12, DUP13, DUP14, DUP15, DUP16: |