tornadocontrib/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core/asm: Use hexadecimal addresses in assembly dumps (#17870)

Browse Source
This commit is contained in:
Guillaume Ballet 2018-10-09 09:27:07 +02:00 committed by Péter Szilágyi
parent 11d0ff6578
commit 97b2806686
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/asm/asm.go
View File

@ -109,9 +109,9 @@ func PrintDisassembled(code string) error {
it := NewInstructionIterator(script) it := NewInstructionIterator(script)
for it.Next() { for it.Next() {
if it.Arg() != nil && 0 < len(it.Arg()) { if it.Arg() != nil && 0 < len(it.Arg()) {
fmt.Printf("%06v: %v 0x%x\n", it.PC(), it.Op(), it.Arg()) fmt.Printf("%05x: %v 0x%x\n", it.PC(), it.Op(), it.Arg())
} else { } else {
fmt.Printf("%06v: %v\n", it.PC(), it.Op()) fmt.Printf("%05x: %v\n", it.PC(), it.Op())
} }
} }
return it.Error() return it.Error()
@ -124,9 +124,9 @@ func Disassemble(script []byte) ([]string, error) {
it := NewInstructionIterator(script) it := NewInstructionIterator(script)
for it.Next() { for it.Next() {
if it.Arg() != nil && 0 < len(it.Arg()) { if it.Arg() != nil && 0 < len(it.Arg()) {
instrs = append(instrs, fmt.Sprintf("%06v: %v 0x%x\n", it.PC(), it.Op(), it.Arg())) instrs = append(instrs, fmt.Sprintf("%05x: %v 0x%x\n", it.PC(), it.Op(), it.Arg()))
} else { } else {
instrs = append(instrs, fmt.Sprintf("%06v: %v\n", it.PC(), it.Op())) instrs = append(instrs, fmt.Sprintf("%05x: %v\n", it.PC(), it.Op()))
} }
} }
if err := it.Error(); err != nil { if err := it.Error(); err != nil {