diff options
| author | Maran <maran.hidskes@gmail.com> | 2014-05-07 17:05:53 +0800 |
|---|---|---|
| committer | Maran <maran.hidskes@gmail.com> | 2014-05-07 17:05:53 +0800 |
| commit | 6c66cb3fa9d73fbb9f570a3f1b7f7dcd24ee2b7f (patch) | |
| tree | a1709b5ca22500683aa68ddbe53f331fe15435a6 /ethchain/asm.go | |
| parent | 45ce820b111ab2b4e4c7b8d83dd8bebf1bb37bad (diff) | |
| parent | 76d7bad722dd4e5a94a3665ad94af65e2f421a8b (diff) | |
| download | dexon-6c66cb3fa9d73fbb9f570a3f1b7f7dcd24ee2b7f.tar dexon-6c66cb3fa9d73fbb9f570a3f1b7f7dcd24ee2b7f.tar.gz dexon-6c66cb3fa9d73fbb9f570a3f1b7f7dcd24ee2b7f.tar.bz2 dexon-6c66cb3fa9d73fbb9f570a3f1b7f7dcd24ee2b7f.tar.lz dexon-6c66cb3fa9d73fbb9f570a3f1b7f7dcd24ee2b7f.tar.xz dexon-6c66cb3fa9d73fbb9f570a3f1b7f7dcd24ee2b7f.tar.zst dexon-6c66cb3fa9d73fbb9f570a3f1b7f7dcd24ee2b7f.zip | |
Merge branch 'develop' of github.com:ethereum/eth-go into develop
Diffstat (limited to 'ethchain/asm.go')
| -rw-r--r-- | ethchain/asm.go | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/ethchain/asm.go b/ethchain/asm.go index 3194549ba..d46e46af7 100644 --- a/ethchain/asm.go +++ b/ethchain/asm.go @@ -21,7 +21,7 @@ func Disassemble(script []byte) (asm []string) { asm = append(asm, fmt.Sprintf("%v", op)) switch op { - case oPUSH: // Push PC+1 on to the stack + case oPUSH32: // Push PC+1 on to the stack pc.Add(pc, ethutil.Big1) data := script[pc.Int64() : pc.Int64()+32] val := ethutil.BigD(data) @@ -36,20 +36,6 @@ func Disassemble(script []byte) (asm []string) { asm = append(asm, fmt.Sprintf("0x%x", b)) pc.Add(pc, big.NewInt(31)) - case oPUSH20: - pc.Add(pc, ethutil.Big1) - data := script[pc.Int64() : pc.Int64()+20] - val := ethutil.BigD(data) - var b []byte - if val.Int64() == 0 { - b = []byte{0} - } else { - b = val.Bytes() - } - - asm = append(asm, fmt.Sprintf("0x%x", b)) - - pc.Add(pc, big.NewInt(19)) } pc.Add(pc, ethutil.Big1) |