roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

Merge branch 'develop' into poc8

Browse Source
This commit is contained in:
obscuren 2014-12-30 16:16:11 +01:00
commit 788d812a72
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
vm/closure.go
View File

@ -1,8 +1,10 @@
package vm package vm
import ( import (
"math"
"math/big" "math/big"
"github.com/ethereum/go-ethereum/ethutil"
"github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/state"
) )
@ -51,19 +53,14 @@ func (c *Closure) GetByte(x uint64) byte {
} }
func (c *Closure) GetBytes(x, y int) []byte { func (c *Closure) GetBytes(x, y int) []byte {
if x >= len(c.Code) || y >= len(c.Code) { return c.GetRangeValue(uint64(x), uint64(y))
return nil
}
return c.Code[x : x+y]
} }
func (c *Closure) GetRangeValue(x, y uint64) []byte { func (c *Closure) GetRangeValue(x, size uint64) []byte {
if x >= uint64(len(c.Code)) || y >= uint64(len(c.Code)) { x = uint64(math.Min(float64(x), float64(len(c.Code))))
return nil y := uint64(math.Min(float64(x+size), float64(len(c.Code))))
}
return c.Code[x : x+y] return ethutil.LeftPadBytes(c.Code[x:y], int(size))
} }
func (c *Closure) Return(ret []byte) []byte { func (c *Closure) Return(ret []byte) []byte {

5
vm/vm_debug.go
View File

@ -716,7 +716,8 @@ func (self *DebugVm) Run(me, caller ClosureRef, code []byte, value, gas, price *
//a := big.NewInt(int64(op) - int64(PUSH1) + 1) //a := big.NewInt(int64(op) - int64(PUSH1) + 1)
a := uint64(op - PUSH1 + 1) a := uint64(op - PUSH1 + 1)
//pc.Add(pc, ethutil.Big1) //pc.Add(pc, ethutil.Big1)
val := ethutil.BigD(closure.GetRangeValue(pc+1, a)) byts := closure.GetRangeValue(pc+1, a)
val := ethutil.BigD(byts)
// Push value to stack // Push value to stack
stack.Push(val) stack.Push(val)
pc += a pc += a
@ -724,7 +725,7 @@ func (self *DebugVm) Run(me, caller ClosureRef, code []byte, value, gas, price *
step += int(op) - int(PUSH1) + 1 step += int(op) - int(PUSH1) + 1
self.Printf(" => 0x%x", val.Bytes()) self.Printf(" => 0x%x", byts)
case POP: case POP:
stack.Pop() stack.Pop()
case DUP1, DUP2, DUP3, DUP4, DUP5, DUP6, DUP7, DUP8, DUP9, DUP10, DUP11, DUP12, DUP13, DUP14, DUP15, DUP16: case DUP1, DUP2, DUP3, DUP4, DUP5, DUP6, DUP7, DUP8, DUP9, DUP10, DUP11, DUP12, DUP13, DUP14, DUP15, DUP16: