diff options
author | obscuren <geffobscura@gmail.com> | 2014-12-03 19:21:12 +0800 |
---|---|---|
committer | obscuren <geffobscura@gmail.com> | 2014-12-03 19:21:12 +0800 |
commit | 3d9a4e7084c33cb28a2265c0dd232a0ea3871c92 (patch) | |
tree | 84b7ccf6ea1ccc4eca0b8ded0a382c1bfe98e190 /vm/vm_debug.go | |
parent | f7789220862f67c2aadaf7b6a44fcd54152dd234 (diff) | |
download | go-tangerine-3d9a4e7084c33cb28a2265c0dd232a0ea3871c92.tar go-tangerine-3d9a4e7084c33cb28a2265c0dd232a0ea3871c92.tar.gz go-tangerine-3d9a4e7084c33cb28a2265c0dd232a0ea3871c92.tar.bz2 go-tangerine-3d9a4e7084c33cb28a2265c0dd232a0ea3871c92.tar.lz go-tangerine-3d9a4e7084c33cb28a2265c0dd232a0ea3871c92.tar.xz go-tangerine-3d9a4e7084c33cb28a2265c0dd232a0ea3871c92.tar.zst go-tangerine-3d9a4e7084c33cb28a2265c0dd232a0ea3871c92.zip |
Fixed mem error in vm. Fixed logs tests
Diffstat (limited to 'vm/vm_debug.go')
-rw-r--r-- | vm/vm_debug.go | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/vm/vm_debug.go b/vm/vm_debug.go index dbab8fbcb..91d3c55c1 100644 --- a/vm/vm_debug.go +++ b/vm/vm_debug.go @@ -35,7 +35,7 @@ func NewDebugVm(env Environment) *DebugVm { lt = LogTyDiff } - return &DebugVm{env: env, logTy: lt, Recoverable: true} + return &DebugVm{env: env, logTy: lt, Recoverable: false} } func (self *DebugVm) RunClosure(closure *Closure) (ret []byte, err error) { @@ -168,8 +168,10 @@ func (self *DebugVm) RunClosure(closure *Closure) (ret []byte, err error) { gas.Set(GasLog) addStepGasUsage(new(big.Int).Mul(big.NewInt(int64(n)), GasLog)) - mSize, _ := stack.Peekn() + mSize, mStart := stack.Peekn() addStepGasUsage(mSize) + + newMemSize = calcMemSize(mStart, mSize) case EXP: require(2) @@ -755,10 +757,10 @@ func (self *DebugVm) RunClosure(closure *Closure) (ret []byte, err error) { case LOG0, LOG1, LOG2, LOG3, LOG4: n := int(op - LOG0) topics := make([][]byte, n) - mStart, mSize := stack.Pop().Int64(), stack.Pop().Int64() + mSize, mStart := stack.Pop().Int64(), stack.Pop().Int64() data := mem.Geti(mStart, mSize) for i := 0; i < n; i++ { - topics[i] = stack.Pop().Bytes() + topics[i] = ethutil.LeftPadBytes(stack.Pop().Bytes(), 32) } log := &state.Log{closure.Address(), topics, data} |