diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-08-09 08:11:28 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-08-09 08:11:28 +0800 |
| commit | 1cbd53add8f88032e82b9df7ac6813d4120cc75c (patch) | |
| tree | 01c07f1044dd6b35b45fe7079bdb8ef328bac1b7 | |
| parent | c93f0b9f4ba84933110435a80055cdaabd078159 (diff) | |
| parent | eec38c5853526f0cf8df0ccbd8e13f0a6c76a04a (diff) | |
| download | dexon-1cbd53add8f88032e82b9df7ac6813d4120cc75c.tar dexon-1cbd53add8f88032e82b9df7ac6813d4120cc75c.tar.gz dexon-1cbd53add8f88032e82b9df7ac6813d4120cc75c.tar.bz2 dexon-1cbd53add8f88032e82b9df7ac6813d4120cc75c.tar.lz dexon-1cbd53add8f88032e82b9df7ac6813d4120cc75c.tar.xz dexon-1cbd53add8f88032e82b9df7ac6813d4120cc75c.tar.zst dexon-1cbd53add8f88032e82b9df7ac6813d4120cc75c.zip | |
Merge pull request #1626 from obscuren/defaults-fix
cmd/geth, core/vm: setup vm settings and defaulted JIT disabled
| -rw-r--r-- | cmd/geth/main.go | 1 | ||||
| -rw-r--r-- | core/vm/settings.go | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/cmd/geth/main.go b/cmd/geth/main.go index 0e73822f3..895e55b44 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -336,6 +336,7 @@ JavaScript API. See https://github.com/ethereum/go-ethereum/wiki/Javascipt-Conso } app.Before = func(ctx *cli.Context) error { utils.SetupLogger(ctx) + utils.SetupVM(ctx) if ctx.GlobalBool(utils.PProfEanbledFlag.Name) { utils.StartPProf(ctx) } diff --git a/core/vm/settings.go b/core/vm/settings.go index b94efd9ab..0cd931b6a 100644 --- a/core/vm/settings.go +++ b/core/vm/settings.go @@ -17,9 +17,9 @@ package vm var ( - DisableJit bool // Disable the JIT VM - ForceJit bool // Force the JIT, skip byte VM - MaxProgSize int // Max cache size for JIT Programs + DisableJit bool = true // Disable the JIT VM + ForceJit bool // Force the JIT, skip byte VM + MaxProgSize int // Max cache size for JIT Programs ) const defaultJitMaxCache int = 64 |