From c52ab932e61ef9eba37c107e8b58b22c7d32e6c2 Mon Sep 17 00:00:00 2001
From: Valentin Wüstholz <wuestholz@users.noreply.github.com>
Date: Wed, 1 Mar 2017 13:34:50 +0100
Subject: cmd/disasm, cmd/evm: integrate disasm tool into evm tool. (#3729)

---
 cmd/disasm/main.go | 42 ------------------------------------------
 cmd/evm/disasm.go  | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 cmd/evm/main.go    |  1 +
 3 files changed, 54 insertions(+), 42 deletions(-)
 delete mode 100644 cmd/disasm/main.go
 create mode 100644 cmd/evm/disasm.go

diff --git a/cmd/disasm/main.go b/cmd/disasm/main.go
deleted file mode 100644
index 4ea2dfcba..000000000
--- a/cmd/disasm/main.go
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2015 The go-ethereum Authors
-// This file is part of go-ethereum.
-//
-// go-ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// go-ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with go-ethereum. If not, see <http://www.gnu.org/licenses/>.
-
-// disasm is a pretty-printer for EVM bytecode.
-package main
-
-import (
-	"fmt"
-	"io/ioutil"
-	"os"
-	"strings"
-
-	"github.com/ethereum/go-ethereum/core/asm"
-)
-
-func main() {
-	in, err := ioutil.ReadAll(os.Stdin)
-	if err != nil {
-		fmt.Println(err)
-		os.Exit(1)
-	}
-	code := strings.TrimSpace(string(in[:]))
-	fmt.Printf("%v\n", code)
-	err = asm.PrintDisassembled(code)
-	if err != nil {
-		fmt.Printf("Error: %v\n", err)
-		return
-	}
-}
diff --git a/cmd/evm/disasm.go b/cmd/evm/disasm.go
new file mode 100644
index 000000000..01a8c60ba
--- /dev/null
+++ b/cmd/evm/disasm.go
@@ -0,0 +1,53 @@
+// Copyright 2017 The go-ethereum Authors
+// This file is part of go-ethereum.
+//
+// go-ethereum is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// go-ethereum is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with go-ethereum. If not, see <http://www.gnu.org/licenses/>.
+
+package main
+
+import (
+	"errors"
+	"fmt"
+	"io/ioutil"
+
+	"github.com/ethereum/go-ethereum/core/asm"
+	cli "gopkg.in/urfave/cli.v1"
+	"strings"
+)
+
+var disasmCommand = cli.Command{
+	Action:    disasmCmd,
+	Name:      "disasm",
+	Usage:     "disassembles evm binary",
+	ArgsUsage: "<file>",
+}
+
+func disasmCmd(ctx *cli.Context) error {
+	if len(ctx.Args().First()) == 0 {
+		return errors.New("filename required")
+	}
+
+	fn := ctx.Args().First()
+	in, err := ioutil.ReadFile(fn)
+	if err != nil {
+		return err
+	}
+
+	code := strings.TrimSpace(string(in[:]))
+	fmt.Printf("%v\n", code)
+	if err = asm.PrintDisassembled(code); err != nil {
+		return err
+	}
+	return nil
+}
diff --git a/cmd/evm/main.go b/cmd/evm/main.go
index 5ce45b9ca..cc4f8a49c 100644
--- a/cmd/evm/main.go
+++ b/cmd/evm/main.go
@@ -101,6 +101,7 @@ func init() {
 	}
 	app.Commands = []cli.Command{
 		compileCommand,
+		disasmCommand,
 		runCommand,
 	}
 }
-- 
cgit