Merge pull request #1626 from obscuren/defaults-fix

cmd/geth, core/vm: setup vm settings and defaulted JIT disabled
ethereum · Aug 9, 2015 · 1cbd53a · 1cbd53a
2 parents c93f0b9 + eec38c5
commit 1cbd53a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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