aboutsummaryrefslogtreecommitdiffstats
path: root/vm/analysis.go
diff options
context:
space:
mode:
Diffstat (limited to 'vm/analysis.go')
-rw-r--r--vm/analysis.go25
1 files changed, 5 insertions, 20 deletions
diff --git a/vm/analysis.go b/vm/analysis.go
index fef448b7b..411df5686 100644
--- a/vm/analysis.go
+++ b/vm/analysis.go
@@ -1,34 +1,19 @@
package vm
-import (
- "math/big"
+import "gopkg.in/fatih/set.v0"
- "github.com/ethereum/go-ethereum/ethutil"
-)
+func analyseJumpDests(code []byte) (dests *set.Set) {
+ dests = set.New()
-func analyseJumpDests(code []byte) (dests map[uint64]*big.Int) {
- dests = make(map[uint64]*big.Int)
-
- lp := false
- var lpv *big.Int
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
- if uint64(len(code)) > pc+1+a {
- lpv = ethutil.BigD(code[pc+1 : pc+1+a])
- }
pc += a
- lp = true
- case JUMP, JUMPI:
- if lp {
- dests[pc] = lpv
- }
-
- default:
- lp = false
+ case JUMPDEST:
+ dests.Add(pc)
}
}
return