diff options
| author | Yondon Fu <yondon.fu@gmail.com> | 2017-12-19 06:17:41 +0800 |
|---|---|---|
| committer | Yondon Fu <yondon.fu@gmail.com> | 2017-12-19 06:17:41 +0800 |
| commit | 3857cdc267e3192697f561df0a0f827f65dfb6b5 (patch) | |
| tree | 401c52c4972a68229ea283a394a0b0a5f3cfdc8e /core/asm | |
| parent | a5330fe0c569b75cb8a524f60f7e8dc06498262b (diff) | |
| parent | fe070ab5c32702033489f1b9d1655ea1b894c29e (diff) | |
| download | dexon-3857cdc267e3192697f561df0a0f827f65dfb6b5.tar dexon-3857cdc267e3192697f561df0a0f827f65dfb6b5.tar.gz dexon-3857cdc267e3192697f561df0a0f827f65dfb6b5.tar.bz2 dexon-3857cdc267e3192697f561df0a0f827f65dfb6b5.tar.lz dexon-3857cdc267e3192697f561df0a0f827f65dfb6b5.tar.xz dexon-3857cdc267e3192697f561df0a0f827f65dfb6b5.tar.zst dexon-3857cdc267e3192697f561df0a0f827f65dfb6b5.zip | |
Merge branch 'master' into abi-offset-fixed-arrays
Diffstat (limited to 'core/asm')
| -rw-r--r-- | core/asm/asm.go | 5 | ||||
| -rw-r--r-- | core/asm/compiler.go | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/core/asm/asm.go b/core/asm/asm.go index 5fe827e7c..ce22f93f9 100644 --- a/core/asm/asm.go +++ b/core/asm/asm.go @@ -114,10 +114,7 @@ func PrintDisassembled(code string) error { fmt.Printf("%06v: %v\n", it.PC(), it.Op()) } } - if err := it.Error(); err != nil { - return err - } - return nil + return it.Error() } // Return all disassembled EVM instructions in human-readable format. diff --git a/core/asm/compiler.go b/core/asm/compiler.go index b2c85375c..318c4e4d8 100644 --- a/core/asm/compiler.go +++ b/core/asm/compiler.go @@ -237,10 +237,7 @@ func (c *Compiler) pushBin(v interface{}) { // isPush returns whether the string op is either any of // push(N). func isPush(op string) bool { - if op == "push" { - return true - } - return false + return op == "push" } // isJump returns whether the string op is jump(i) |