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

core/vm: RETURN op code returns pointer to memory rather than copy

Browse Source
This commit is contained in:
obscuren 2015-05-19 17:26:38 +02:00
parent 648b352424
commit f5af1fdca8
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/vm/memory.go
View File

@ -49,6 +49,18 @@ func (self *Memory) Get(offset, size int64) (cpy []byte) {
return return
} }
func (self *Memory) GetPtr(offset, size int64) []byte {
if size == 0 {
return nil
}
if len(self.store) > int(offset) {
return self.store[offset : offset+size]
}
return nil
}
func (m *Memory) Len() int { func (m *Memory) Len() int {
return len(m.store) return len(m.store)
} }

2
core/vm/vm.go
View File

@ -695,7 +695,7 @@ func (self *Vm) Run(context *Context, callData []byte) (ret []byte, err error) {
self.Printf("resume %x (%v)", context.Address(), context.Gas) self.Printf("resume %x (%v)", context.Address(), context.Gas)
case RETURN: case RETURN:
offset, size := stack.pop(), stack.pop() offset, size := stack.pop(), stack.pop()
ret := mem.Get(offset.Int64(), size.Int64()) ret := mem.GetPtr(offset.Int64(), size.Int64())
self.Printf(" => [%v, %v] (%d) 0x%x", offset, size, len(ret), ret).Endl() self.Printf(" => [%v, %v] (%d) 0x%x", offset, size, len(ret), ret).Endl()

8
tests/vm/gh_test.go
View File

@ -286,13 +286,13 @@ func TestInputLimitsLight(t *testing.T) {
RunVmTest(fn, t) RunVmTest(fn, t)
} }
func TestStateExample(t *testing.T) { func TestStateSystemOperations(t *testing.T) {
const fn = "../files/StateTests/stExample.json" const fn = "../files/StateTests/stSystemOperationsTest.json"
RunVmTest(fn, t) RunVmTest(fn, t)
} }
func TestStateSystemOperations(t *testing.T) { func TestStateExample(t *testing.T) {
const fn = "../files/StateTests/stSystemOperationsTest.json" const fn = "../files/StateTests/stExample.json"
RunVmTest(fn, t) RunVmTest(fn, t)
} }