aboutsummaryrefslogtreecommitdiffstats
path: root/core/vm
diff options
context:
space:
mode:
authorJeffrey Wilcke <jeffrey@ethereum.org>2017-03-01 08:11:24 +0800
committerFelix Lange <fjl@users.noreply.github.com>2017-03-01 08:11:24 +0800
commit230cf2ec9142b6a8f421cb8873deb5df1566e89c (patch)
treeb437803c8d90384d8ecb68e8a180db384535c018 /core/vm
parent7ff75ac2f2f8a62d52367271194aa7889a5b5c88 (diff)
downloadgo-tangerine-230cf2ec9142b6a8f421cb8873deb5df1566e89c.tar
go-tangerine-230cf2ec9142b6a8f421cb8873deb5df1566e89c.tar.gz
go-tangerine-230cf2ec9142b6a8f421cb8873deb5df1566e89c.tar.bz2
go-tangerine-230cf2ec9142b6a8f421cb8873deb5df1566e89c.tar.lz
go-tangerine-230cf2ec9142b6a8f421cb8873deb5df1566e89c.tar.xz
go-tangerine-230cf2ec9142b6a8f421cb8873deb5df1566e89c.tar.zst
go-tangerine-230cf2ec9142b6a8f421cb8873deb5df1566e89c.zip
cmd/evm, core/asm: add EVM assembler (#3686)
The evm compile command implements a simple assembly language that compiles to EVM bytecode.
Diffstat (limited to 'core/vm')
-rw-r--r--core/vm/logger.go20
1 files changed, 2 insertions, 18 deletions
diff --git a/core/vm/logger.go b/core/vm/logger.go
index 102a215c7..ccdf21a4b 100644
--- a/core/vm/logger.go
+++ b/core/vm/logger.go
@@ -17,10 +17,10 @@
package vm
import (
+ "encoding/hex"
"fmt"
"math/big"
"os"
- "unicode"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/math"
@@ -184,24 +184,8 @@ func StdErrFormat(logs []StructLog) {
fmt.Fprintf(os.Stderr, "%04d: %x\n", len(log.Stack)-i-1, math.PaddedBigBytes(log.Stack[i], 32))
}
- const maxMem = 10
- addr := 0
fmt.Fprintln(os.Stderr, "MEM =", len(log.Memory))
- for i := 0; i+16 <= len(log.Memory) && addr < maxMem; i += 16 {
- data := log.Memory[i : i+16]
- str := fmt.Sprintf("%04d: % x ", addr*16, data)
- for _, r := range data {
- if r == 0 {
- str += "."
- } else if unicode.IsPrint(rune(r)) {
- str += fmt.Sprintf("%s", string(r))
- } else {
- str += "?"
- }
- }
- addr++
- fmt.Fprintln(os.Stderr, str)
- }
+ fmt.Fprintln(os.Stderr, hex.Dump(log.Memory))
fmt.Fprintln(os.Stderr, "STORAGE =", len(log.Storage))
for h, item := range log.Storage {