From f062fd0165b33ed2b4060942ba9e59734de8a65a Mon Sep 17 00:00:00 2001
From: artur-zawlocki <artur.zawlocki@gmail.com>
Date: Thu, 16 Oct 2014 12:35:51 +0100
Subject: [PATCH 1/2] Dumping CFG to .dot: showing indirect jumps with dashed
 lines

---
 evmcc/Compiler.cpp | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/evmcc/Compiler.cpp b/evmcc/Compiler.cpp
index a7e8ba4831..8acfa7d05a 100644
--- a/evmcc/Compiler.cpp
+++ b/evmcc/Compiler.cpp
@@ -935,7 +935,6 @@ void Compiler::dumpBasicBlockGraph(std::ostream& out)
 	    << "  node [shape=record];\n"
 	    << "  entry [share=record, label=\"entry block\"];\n";
 
-	// std::map<std::string, BasicBlock*> blocksByName;
 	std::vector<BasicBlock*> blocks;
 	for (auto& pair : this->basicBlocks)
 	{
@@ -948,7 +947,6 @@ void Compiler::dumpBasicBlockGraph(std::ostream& out)
 	for (auto bb : blocks)
 	{
 		std::string blockName = bb->llvm()->getName();
-		// blocksByName.insert(std::pair<std::string, BasicBlock*>(blockName, bb));
 
 		int numOfPhiNodes = 0;
 		auto firstNonPhiPtr = bb->llvm()->getFirstNonPHI();
@@ -957,10 +955,8 @@ void Compiler::dumpBasicBlockGraph(std::ostream& out)
 		auto endStackSize = bb->getStack().size();
 
 		out << "  \"" << blockName  << "\" [shape=record, label=\""
-			<< std::to_string(numOfPhiNodes) << "|"
-			<< blockName << "|"
-			<< std::to_string(endStackSize)
-		<< "\"];\n";
+			<< numOfPhiNodes << "|" << blockName << "|" << endStackSize
+			<< "\"];\n";
 	}
 
 	out << "  entry -> \"Instr.0\";\n";
@@ -974,7 +970,8 @@ void Compiler::dumpBasicBlockGraph(std::ostream& out)
 		for (llvm::succ_iterator it = llvm::succ_begin(bb->llvm()); it != end; ++it)
 		{
 			std::string succName = it->getName();
-			out << "  \"" << blockName << "\" -> \"" << succName << "\";\n";
+			out << "  \"" << blockName << "\" -> \"" << succName << "\""
+			    << ((bb == m_jumpTableBlock.get()) ? " [style = dashed];\n" : "\n");
 		}
 	}
 

From 54e0824b3164e3cb6da5ea2ed442721ea5abcd0e Mon Sep 17 00:00:00 2001
From: artur-zawlocki <artur.zawlocki@gmail.com>
Date: Mon, 20 Oct 2014 16:12:00 +0100
Subject: [PATCH 2/2] Updated cmake files after moving the jit compiler to a
 lib.

---
 evmcc/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/evmcc/CMakeLists.txt b/evmcc/CMakeLists.txt
index f09c327b87..ae91621620 100644
--- a/evmcc/CMakeLists.txt
+++ b/evmcc/CMakeLists.txt
@@ -12,6 +12,7 @@ target_link_libraries(${EXECUTABLE} devcore)
 target_link_libraries(${EXECUTABLE} ethcore)
 target_link_libraries(${EXECUTABLE} evm)
 target_link_libraries(${EXECUTABLE} evmface)
+target_link_libraries(${EXECUTABLE} evmjit)
 
 if ("${TARGET_PLATFORM}" STREQUAL "w64")
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libgcc -static-libstdc++")