From 6bf994de4d5532495f0f8ff99eb3663acce0b5dc Mon Sep 17 00:00:00 2001
From: artur-zawlocki <artur.zawlocki@gmail.com>
Date: Tue, 28 Oct 2014 22:25:08 +0000
Subject: [PATCH] 1. Indenting spaces converted to tabs 2. Options changed: -G
 --> -g

---
 evmcc/evmcc.cpp | 125 ++++++++++++++++++++++++++----------------------
 1 file changed, 69 insertions(+), 56 deletions(-)

diff --git a/evmcc/evmcc.cpp b/evmcc/evmcc.cpp
index abaf3e511..1e0b7e1cd 100644
--- a/evmcc/evmcc.cpp
+++ b/evmcc/evmcc.cpp
@@ -1,4 +1,5 @@
 
+#include <chrono>
 #include <iostream>
 #include <fstream>
 #include <ostream>
@@ -18,92 +19,104 @@
 
 void show_usage()
 {
-    // FIXME: Use arg[0] as program name?
-    std::cerr << "usage: evmcc (-b|-c|-d)+ <inputfile.bc>\n";
+	// FIXME: Use arg[0] as program name?
+	std::cerr << "usage: evmcc (-b|-c|-d)+ <inputfile.bc>\n";
 }
 
 
 int main(int argc, char** argv)
 {
-    std::string input_file;
-    bool opt_dissassemble = false;
-    bool opt_show_bytes = false;
+	std::string input_file;
+	bool opt_dissassemble = false;
+	bool opt_show_bytes = false;
 	bool opt_compile = false;
 	bool opt_interpret = false;
 	bool opt_dump_graph = false;
 	bool opt_unknown = false;
+	bool opt_verbose = false;
 	size_t initialGas = 10000;
 
-    for (int i = 1; i < argc; i++)
-    {
-        std::string option = argv[i];
-        if (option == "-b")
-            opt_show_bytes = true;
-        else if (option == "-c")
-            opt_compile = true;
-        else if (option == "-d")
+	for (int i = 1; i < argc; i++)
+	{
+		std::string option = argv[i];
+		if (option == "-b")
+			opt_show_bytes = true;
+		else if (option == "-c")
+			opt_compile = true;
+		else if (option == "-d")
 			opt_dissassemble = true;
 		else if (option == "-i")
 			opt_interpret = true;
-		else if (option == "-g")
+		else if (option == "--dump-cfg")
 			opt_dump_graph = true;
-		else if (option == "-G" && i + 1 < argc)
+		else if (option == "-g" && i + 1 < argc)
 		{
 			std::string gasValue = argv[++i];
 			initialGas = boost::lexical_cast<size_t>(gasValue);
 			std::cerr << "Initial gas set to " << initialGas << "\n";
 		}
+		else if (option == "-v")
+			opt_verbose = true;
 		else if (option[0] != '-' && input_file.empty())
 			input_file = option;
-        else
-        {
-            opt_unknown = true;
-            break;
-        }
-    }
-
-    if (opt_unknown ||
-        input_file.empty() ||
-        (!opt_show_bytes && !opt_compile && !opt_dissassemble && !opt_interpret))
-    {
-        show_usage();
-        exit(1);
-    }
-
-    std::ifstream ifs(input_file);
-    if (!ifs.is_open())
-    {
-        std::cerr << "cannot open file " << input_file << std::endl;
-        exit(1);
-    }
-
-    std::string src((std::istreambuf_iterator<char>(ifs)),
-		    (std::istreambuf_iterator<char>()));
-
-    boost::algorithm::trim(src);
+		else
+		{
+			opt_unknown = true;
+			break;
+		}
+	}
+
+	if (opt_unknown ||
+		input_file.empty() ||
+		(!opt_show_bytes && !opt_compile && !opt_dissassemble && !opt_interpret))
+	{
+		show_usage();
+		exit(1);
+	}
+
+	std::ifstream ifs(input_file);
+	if (!ifs.is_open())
+	{
+		std::cerr << "cannot open file " << input_file << std::endl;
+		exit(1);
+	}
+
+	std::string src((std::istreambuf_iterator<char>(ifs)),
+	                (std::istreambuf_iterator<char>()));
+
+	boost::algorithm::trim(src);
 
 	using namespace dev;
 
-    bytes bytecode = fromHex(src);
+	bytes bytecode = fromHex(src);
 
-    if (opt_show_bytes)
-    {
-        std::cout << memDump(bytecode) << std::endl;
-    }
+	if (opt_show_bytes)
+		std::cout << memDump(bytecode) << std::endl;
 
-    if (opt_dissassemble)
-    {
-        std::string assembly = eth::disassemble(bytecode);
-        std::cout << assembly << std::endl;
-    }
+	if (opt_dissassemble)
+	{
+		std::string assembly = eth::disassemble(bytecode);
+		std::cout << assembly << std::endl;
+	}
 
-    if (opt_compile || opt_interpret)
-    {
-    	auto compiler = eth::jit::Compiler();
+	if (opt_compile || opt_interpret)
+	{
+		auto compilationStartTime = std::chrono::high_resolution_clock::now();
+
+		auto compiler = eth::jit::Compiler();
 		auto module = compiler.compile({bytecode.data(), bytecode.size()});
 
+		auto compilationEndTime = std::chrono::high_resolution_clock::now();
+
 		module->dump();
 
+		if (opt_verbose)
+		{
+			std::cerr << "*** Compilation time: "
+			          << std::chrono::duration_cast<std::chrono::microseconds>(compilationEndTime - compilationStartTime).count()
+			          << std::endl;
+		}
+
 		if (opt_dump_graph)
 		{
 			std::ofstream ofs("blocks.dot");
@@ -119,7 +132,7 @@ int main(int argc, char** argv)
 			auto result = engine.run(std::move(module), gas);
 			return result;
 		}
-    }
+	}
 
-    return 0;
+	return 0;
 }