Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
Geth-Modification
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
张蕾
Geth-Modification
Commits
f5af1fdc
Commit
f5af1fdc
authored
May 19, 2015
by
obscuren
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
core/vm: RETURN op code returns pointer to memory rather than copy
parent
648b3524
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
5 deletions
+17
-5
memory.go
core/vm/memory.go
+12
-0
vm.go
core/vm/vm.go
+1
-1
gh_test.go
tests/vm/gh_test.go
+4
-4
No files found.
core/vm/memory.go
View file @
f5af1fdc
...
...
@@ -49,6 +49,18 @@ func (self *Memory) Get(offset, size int64) (cpy []byte) {
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
{
return
len
(
m
.
store
)
}
...
...
core/vm/vm.go
View file @
f5af1fdc
...
...
@@ -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
)
case
RETURN
:
offset
,
size
:=
stack
.
pop
(),
stack
.
pop
()
ret
:=
mem
.
Get
(
offset
.
Int64
(),
size
.
Int64
())
ret
:=
mem
.
Get
Ptr
(
offset
.
Int64
(),
size
.
Int64
())
self
.
Printf
(
" => [%v, %v] (%d) 0x%x"
,
offset
,
size
,
len
(
ret
),
ret
)
.
Endl
()
...
...
tests/vm/gh_test.go
View file @
f5af1fdc
...
...
@@ -286,13 +286,13 @@ func TestInputLimitsLight(t *testing.T) {
RunVmTest
(
fn
,
t
)
}
func
TestState
Example
(
t
*
testing
.
T
)
{
const
fn
=
"../files/StateTests/st
Example
.json"
func
TestState
SystemOperations
(
t
*
testing
.
T
)
{
const
fn
=
"../files/StateTests/st
SystemOperationsTest
.json"
RunVmTest
(
fn
,
t
)
}
func
TestState
SystemOperations
(
t
*
testing
.
T
)
{
const
fn
=
"../files/StateTests/st
SystemOperationsTest
.json"
func
TestState
Example
(
t
*
testing
.
T
)
{
const
fn
=
"../files/StateTests/st
Example
.json"
RunVmTest
(
fn
,
t
)
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment