diff options
| author | obscuren <geffobscura@gmail.com> | 2015-01-03 00:35:55 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-01-03 00:35:55 +0800 |
| commit | 55e55826ee3b763be8805dcdef0468a179619ba1 (patch) | |
| tree | 067d0cdce0e6456a4feb5453ef1d33e3aa5c80cb /vm/analysis.go | |
| parent | 530953050ad0cf99d2a354c165b431d111baa1e3 (diff) | |
| download | go-tangerine-55e55826ee3b763be8805dcdef0468a179619ba1.tar.gz go-tangerine-55e55826ee3b763be8805dcdef0468a179619ba1.tar.zst go-tangerine-55e55826ee3b763be8805dcdef0468a179619ba1.zip | |
Changed JUMP(I) behaviour.
* All jumps must land on a JUMPDEST instruction byte.
* The byte may not be part of a PUSH*
Diffstat (limited to 'vm/analysis.go')
| -rw-r--r-- | vm/analysis.go | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/vm/analysis.go b/vm/analysis.go index fef448b7b..501fbfc4a 100644 --- a/vm/analysis.go +++ b/vm/analysis.go @@ -1,34 +1,20 @@ 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 + //lp = true + case JUMPDEST: + dests.Add(pc) } } return |