From ed84b58af57809a743e5be6f6ea53c079c50b765 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Fri, 6 Mar 2015 16:58:52 +0100
Subject: Debug option for VM & command line flag

---
 cmd/ethereum/main.go |  3 ++-
 cmd/utils/flags.go   | 13 ++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'cmd')

diff --git a/cmd/ethereum/main.go b/cmd/ethereum/main.go
index 1133bd6f7..d9fbabdb7 100644
--- a/cmd/ethereum/main.go
+++ b/cmd/ethereum/main.go
@@ -108,7 +108,8 @@ runtime will execute the file and exit.
 		utils.RPCEnabledFlag,
 		utils.RPCListenAddrFlag,
 		utils.RPCPortFlag,
-		utils.VMTypeFlag,
+		utils.VMDebugFlag,
+		//utils.VMTypeFlag,
 	}
 
 	// missing:
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index fb80ac708..d363ef280 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -26,9 +26,15 @@ import (
 
 var (
 	// General settings
-	VMTypeFlag = cli.IntFlag{
-		Name:  "vm",
-		Usage: "Virtual Machine type: 0 is standard VM, 1 is debug VM",
+	/*
+		VMTypeFlag = cli.IntFlag{
+			Name:  "vm",
+			Usage: "Virtual Machine type: 0 is standard VM, 1 is debug VM",
+		}
+	*/
+	VMDebugFlag = cli.BoolFlag{
+		Name:  "vmdebug",
+		Usage: "Virtual Machine debug output",
 	}
 	KeyRingFlag = cli.StringFlag{
 		Name:  "keyring",
@@ -152,6 +158,7 @@ func GetEthereum(clientID, version string, ctx *cli.Context) *eth.Ethereum {
 		LogLevel:     ctx.GlobalInt(LogLevelFlag.Name),
 		LogFormat:    ctx.GlobalString(LogFormatFlag.Name),
 		MinerThreads: ctx.GlobalInt(MinerThreadsFlag.Name),
+		VmDebug:      ctx.GlobalBool(VMDebugFlag.Name),
 
 		MaxPeers:  ctx.GlobalInt(MaxPeersFlag.Name),
 		Port:      ctx.GlobalString(ListenPortFlag.Name),
-- 
cgit v1.2.3