diff options
| author | Jeffrey Wilcke <geffobscura@gmail.com> | 2015-07-18 05:09:36 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <geffobscura@gmail.com> | 2015-08-07 18:52:17 +0800 |
| commit | 846f34f78b5f76233655d0cf3611706e99f2efe2 (patch) | |
| tree | 4e25f0320e30c0ed45b706835fd4377632bdcb45 /cmd/evm | |
| parent | 698e98d9814605bfea98ba3ad2fe7fda073cb2b1 (diff) | |
| download | dexon-846f34f78b5f76233655d0cf3611706e99f2efe2.tar dexon-846f34f78b5f76233655d0cf3611706e99f2efe2.tar.gz dexon-846f34f78b5f76233655d0cf3611706e99f2efe2.tar.bz2 dexon-846f34f78b5f76233655d0cf3611706e99f2efe2.tar.lz dexon-846f34f78b5f76233655d0cf3611706e99f2efe2.tar.xz dexon-846f34f78b5f76233655d0cf3611706e99f2efe2.tar.zst dexon-846f34f78b5f76233655d0cf3611706e99f2efe2.zip | |
core/vm, tests: implemented semi-jit vm
* changed stack and removed stack ptr. Let go decide on slice reuse.
Diffstat (limited to 'cmd/evm')
| -rw-r--r-- | cmd/evm/main.go | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/cmd/evm/main.go b/cmd/evm/main.go index 965994382..7dd375b14 100644 --- a/cmd/evm/main.go +++ b/cmd/evm/main.go @@ -32,6 +32,7 @@ import ( "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/vm" "github.com/ethereum/go-ethereum/ethdb" + "github.com/ethereum/go-ethereum/logger/glog" ) var ( @@ -40,6 +41,14 @@ var ( Name: "debug", Usage: "output full trace logs", } + ForceJitFlag = cli.BoolFlag{ + Name: "forcejit", + Usage: "forces jit compilation", + } + DisableJitFlag = cli.BoolFlag{ + Name: "nojit", + Usage: "disabled jit compilation", + } CodeFlag = cli.StringFlag{ Name: "code", Usage: "EVM code", @@ -77,6 +86,8 @@ func init() { app = utils.NewApp("0.2", "the evm command line interface") app.Flags = []cli.Flag{ DebugFlag, + ForceJitFlag, + DisableJitFlag, SysStatFlag, CodeFlag, GasFlag, @@ -90,6 +101,10 @@ func init() { func run(ctx *cli.Context) { vm.Debug = ctx.GlobalBool(DebugFlag.Name) + vm.ForceJit = ctx.GlobalBool(ForceJitFlag.Name) + vm.DisableJit = ctx.GlobalBool(DisableJitFlag.Name) + + glog.SetToStderr(true) db, _ := ethdb.NewMemDatabase() statedb := state.New(common.Hash{}, db) @@ -110,11 +125,6 @@ func run(ctx *cli.Context) { ) vmdone := time.Since(tstart) - if e != nil { - fmt.Println(e) - os.Exit(1) - } - if ctx.GlobalBool(DumpFlag.Name) { fmt.Println(string(statedb.Dump())) } @@ -133,7 +143,11 @@ num gc: %d `, mem.Alloc, mem.TotalAlloc, mem.Mallocs, mem.HeapAlloc, mem.HeapObjects, mem.NumGC) } - fmt.Printf("OUT: 0x%x\n", ret) + fmt.Printf("OUT: 0x%x", ret) + if e != nil { + fmt.Printf(" error: %v", e) + } + fmt.Println() } func main() { |