diff options
| author | Martin Holst Swende <martin@swende.se> | 2017-06-21 20:52:31 +0800 |
|---|---|---|
| committer | Felix Lange <fjl@users.noreply.github.com> | 2017-06-21 20:52:31 +0800 |
| commit | 9a44e1035ed72eec121cf6fbe38761eea20e09c6 (patch) | |
| tree | 17f5dbc5267d47bc88126bf23776c4a0b42fc348 /core/vm/gen_structlog.go | |
| parent | 9012863ad78bca17f768b83324be8a26ddb34657 (diff) | |
| download | dexon-9a44e1035ed72eec121cf6fbe38761eea20e09c6.tar dexon-9a44e1035ed72eec121cf6fbe38761eea20e09c6.tar.gz dexon-9a44e1035ed72eec121cf6fbe38761eea20e09c6.tar.bz2 dexon-9a44e1035ed72eec121cf6fbe38761eea20e09c6.tar.lz dexon-9a44e1035ed72eec121cf6fbe38761eea20e09c6.tar.xz dexon-9a44e1035ed72eec121cf6fbe38761eea20e09c6.tar.zst dexon-9a44e1035ed72eec121cf6fbe38761eea20e09c6.zip | |
cmd/evm, core/vm: add --nomemory, --nostack to evm (#14617)
Diffstat (limited to 'core/vm/gen_structlog.go')
| -rw-r--r-- | core/vm/gen_structlog.go | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/core/vm/gen_structlog.go b/core/vm/gen_structlog.go index 1c86b2256..88df942dc 100644 --- a/core/vm/gen_structlog.go +++ b/core/vm/gen_structlog.go @@ -18,12 +18,12 @@ func (s StructLog) MarshalJSON() ([]byte, error) { Gas math.HexOrDecimal64 `json:"gas"` GasCost math.HexOrDecimal64 `json:"gasCost"` Memory hexutil.Bytes `json:"memory"` + MemorySize int `json:"memSize"` Stack []*math.HexOrDecimal256 `json:"stack"` Storage map[common.Hash]common.Hash `json:"-"` Depth int `json:"depth"` Err error `json:"error"` OpName string `json:"opName"` - MemorySize int `json:"memSize"` } var enc StructLog enc.Pc = s.Pc @@ -31,6 +31,7 @@ func (s StructLog) MarshalJSON() ([]byte, error) { enc.Gas = math.HexOrDecimal64(s.Gas) enc.GasCost = math.HexOrDecimal64(s.GasCost) enc.Memory = s.Memory + enc.MemorySize = s.MemorySize if s.Stack != nil { enc.Stack = make([]*math.HexOrDecimal256, len(s.Stack)) for k, v := range s.Stack { @@ -41,21 +42,21 @@ func (s StructLog) MarshalJSON() ([]byte, error) { enc.Depth = s.Depth enc.Err = s.Err enc.OpName = s.OpName() - enc.MemorySize = s.MemorySize() return json.Marshal(&enc) } func (s *StructLog) UnmarshalJSON(input []byte) error { type StructLog struct { - Pc *uint64 `json:"pc"` - Op *OpCode `json:"op"` - Gas *math.HexOrDecimal64 `json:"gas"` - GasCost *math.HexOrDecimal64 `json:"gasCost"` - Memory hexutil.Bytes `json:"memory"` - Stack []*math.HexOrDecimal256 `json:"stack"` - Storage map[common.Hash]common.Hash `json:"-"` - Depth *int `json:"depth"` - Err *error `json:"error"` + Pc *uint64 `json:"pc"` + Op *OpCode `json:"op"` + Gas *math.HexOrDecimal64 `json:"gas"` + GasCost *math.HexOrDecimal64 `json:"gasCost"` + Memory hexutil.Bytes `json:"memory"` + MemorySize *int `json:"memSize"` + Stack []*math.HexOrDecimal256 `json:"stack"` + Storage map[common.Hash]common.Hash `json:"-"` + Depth *int `json:"depth"` + Err *error `json:"error"` } var dec StructLog if err := json.Unmarshal(input, &dec); err != nil { @@ -76,6 +77,9 @@ func (s *StructLog) UnmarshalJSON(input []byte) error { if dec.Memory != nil { s.Memory = dec.Memory } + if dec.MemorySize != nil { + s.MemorySize = *dec.MemorySize + } if dec.Stack != nil { s.Stack = make([]*big.Int, len(dec.Stack)) for k, v := range dec.Stack { |