good morning!!!!
Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
B
bor
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Harbor Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
open
bor
Commits
122d2db0
Commit
122d2db0
authored
Jun 3, 2015
by
Jeffrey Wilcke
Browse files
Options
Downloads
Plain Diff
Merge pull request #1150 from fjl/fix-jumpdest
core/vm: improve JUMPDEST analysis
parents
0cd72369
c9ed9d25
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
4
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
core/vm/analysis.go
+26
-15
26 additions, 15 deletions
core/vm/analysis.go
core/vm/context.go
+10
-1
10 additions, 1 deletion
core/vm/context.go
core/vm/vm.go
+13
-14
13 additions, 14 deletions
core/vm/vm.go
tests/files/StateTests/stSpecialTest.json
+124
-0
124 additions, 0 deletions
tests/files/StateTests/stSpecialTest.json
with
173 additions
and
30 deletions
core/vm/analysis.go
+
26
−
15
View file @
122d2db0
...
...
@@ -3,34 +3,45 @@ package vm
import
(
"math/big"
"g
opkg.in/fatih/set.v0
"
"g
ithub.com/ethereum/go-ethereum/common
"
)
type
destinations
struct
{
set
*
set
.
Set
}
var
bigMaxUint64
=
new
(
big
.
Int
)
.
SetUint64
(
^
uint64
(
0
))
func
(
d
*
destinations
)
Has
(
dest
*
big
.
Int
)
bool
{
return
d
.
set
.
Has
(
string
(
dest
.
Bytes
()))
}
// destinations stores one map per contract (keyed by hash of code).
// The maps contain an entry for each location of a JUMPDEST
// instruction.
type
destinations
map
[
common
.
Hash
]
map
[
uint64
]
struct
{}
func
(
d
*
destinations
)
Add
(
dest
*
big
.
Int
)
{
d
.
set
.
Add
(
string
(
dest
.
Bytes
()))
// has checks whether code has a JUMPDEST at dest.
func
(
d
destinations
)
has
(
codehash
common
.
Hash
,
code
[]
byte
,
dest
*
big
.
Int
)
bool
{
// PC cannot go beyond len(code) and certainly can't be bigger than 64bits.
// Don't bother checking for JUMPDEST in that case.
if
dest
.
Cmp
(
bigMaxUint64
)
>
0
{
return
false
}
m
,
analysed
:=
d
[
codehash
]
if
!
analysed
{
m
=
jumpdests
(
code
)
d
[
codehash
]
=
m
}
_
,
ok
:=
m
[
dest
.
Uint64
()]
return
ok
}
func
analyseJumpDests
(
code
[]
byte
)
(
dests
*
destinations
)
{
dests
=
&
destinations
{
set
.
New
()}
// jumpdests creates a map that contains an entry for each
// PC location that is a JUMPDEST instruction.
func
jumpdests
(
code
[]
byte
)
map
[
uint64
]
struct
{}
{
m
:=
make
(
map
[
uint64
]
struct
{})
for
pc
:=
uint64
(
0
);
pc
<
uint64
(
len
(
code
));
pc
++
{
var
op
OpCode
=
OpCode
(
code
[
pc
])
switch
op
{
case
PUSH1
,
PUSH2
,
PUSH3
,
PUSH4
,
PUSH5
,
PUSH6
,
PUSH7
,
PUSH8
,
PUSH9
,
PUSH10
,
PUSH11
,
PUSH12
,
PUSH13
,
PUSH14
,
PUSH15
,
PUSH16
,
PUSH17
,
PUSH18
,
PUSH19
,
PUSH20
,
PUSH21
,
PUSH22
,
PUSH23
,
PUSH24
,
PUSH25
,
PUSH26
,
PUSH27
,
PUSH28
,
PUSH29
,
PUSH30
,
PUSH31
,
PUSH32
:
a
:=
uint64
(
op
)
-
uint64
(
PUSH1
)
+
1
pc
+=
a
case
JUMPDEST
:
dests
.
Add
(
big
.
NewInt
(
int64
(
pc
)))
m
[
pc
]
=
struct
{}{}
}
}
return
return
m
}
This diff is collapsed.
Click to expand it.
core/vm/context.go
+
10
−
1
View file @
122d2db0
...
...
@@ -16,6 +16,8 @@ type Context struct {
caller
ContextRef
self
ContextRef
jumpdests
destinations
// result of JUMPDEST analysis.
Code
[]
byte
CodeAddr
*
common
.
Address
...
...
@@ -24,10 +26,17 @@ type Context struct {
Args
[]
byte
}
// Create a new context for the given data items
// Create a new context for the given data items
.
func
NewContext
(
caller
ContextRef
,
object
ContextRef
,
value
,
gas
,
price
*
big
.
Int
)
*
Context
{
c
:=
&
Context
{
caller
:
caller
,
self
:
object
,
Args
:
nil
}
if
parent
,
ok
:=
caller
.
(
*
Context
);
ok
{
// Reuse JUMPDEST analysis from parent context if available.
c
.
jumpdests
=
parent
.
jumpdests
}
else
{
c
.
jumpdests
=
make
(
destinations
)
}
// Gas should be a pointer so it can safely be reduced through the run
// This pointer will be off the state transition
c
.
Gas
=
gas
//new(big.Int).Set(gas)
...
...
This diff is collapsed.
Click to expand it.
core/vm/vm.go
+
13
−
14
View file @
122d2db0
...
...
@@ -71,18 +71,22 @@ func (self *Vm) Run(context *Context, callData []byte) (ret []byte, err error) {
}
}
// Don't bother with the execution if there's no code.
if
len
(
code
)
==
0
{
return
context
.
Return
(
nil
),
nil
}
var
(
op
OpCode
destinations
=
analyseJumpDests
(
context
.
Code
)
codehash
=
crypto
.
Sha3Hash
(
code
)
mem
=
NewMemory
()
stack
=
newStack
()
pc
=
new
(
big
.
Int
)
statedb
=
self
.
env
.
State
()
jump
=
func
(
from
*
big
.
Int
,
to
*
big
.
Int
)
error
{
if
!
context
.
jumpdests
.
has
(
codehash
,
code
,
to
)
{
nop
:=
context
.
GetOp
(
to
)
if
!
destinations
.
Has
(
to
)
{
return
fmt
.
Errorf
(
"invalid jump destination (%v) %v"
,
nop
,
to
)
}
...
...
@@ -95,11 +99,6 @@ func (self *Vm) Run(context *Context, callData []byte) (ret []byte, err error) {
}
)
// Don't bother with the execution if there's no code.
if
len
(
code
)
==
0
{
return
context
.
Return
(
nil
),
nil
}
for
{
// The base for all big integer arithmetic
base
:=
new
(
big
.
Int
)
...
...
This diff is collapsed.
Click to expand it.
tests/files/StateTests/stSpecialTest.json
+
124
−
0
View file @
122d2db0
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment