From 2111cd4894d421179f46bf8bed13279779f5682c Mon Sep 17 00:00:00 2001
From: chriseth <c@ethdev.com>
Date: Fri, 24 Apr 2015 17:35:16 +0200
Subject: [PATCH] Move assembly related files to libevmasm and Params.h/.cpp to
 libevmcore.

---
 CMakeLists.txt                                |  1 +
 alethzero/CMakeLists.txt                      |  3 +-
 evmjit/libevmjit-cpp/Env.cpp                  |  2 +-
 libethcore/BlockInfo.cpp                      |  2 +-
 libethcore/CMakeLists.txt                     |  2 +-
 libethcore/EthashAux.cpp                      |  2 +-
 libethereum/Interface.h                       |  2 +-
 libethereum/Precompiled.cpp                   |  2 +-
 libethereum/State.h                           |  2 +-
 libethereum/Transaction.h                     |  2 +-
 libevm/VM.h                                   |  2 +-
 {libevmcore => libevmasm}/Assembly.cpp        |  4 +--
 {libevmcore => libevmasm}/Assembly.h          |  4 +--
 {libevmcore => libevmasm}/AssemblyItem.cpp    |  0
 {libevmcore => libevmasm}/AssemblyItem.h      |  2 +-
 libevmasm/CMakeLists.txt                      | 33 +++++++++++++++++
 .../CommonSubexpressionEliminator.cpp         |  4 +--
 .../CommonSubexpressionEliminator.h           |  4 +--
 .../ControlFlowGraph.cpp                      |  8 ++---
 {libevmcore => libevmasm}/ControlFlowGraph.h  |  0
 libevmasm/Exceptions.h                        | 36 +++++++++++++++++++
 .../ExpressionClasses.cpp                     |  6 ++--
 {libevmcore => libevmasm}/ExpressionClasses.h |  2 +-
 .../SemanticInformation.cpp                   |  4 +--
 .../SemanticInformation.h                     |  0
 {libevmcore => libevmasm}/SourceLocation.h    |  0
 libevmcore/CMakeLists.txt                     |  4 ---
 libevmcore/Exceptions.h                       |  7 ++--
 {libethcore => libevmcore}/Params.cpp         |  2 +-
 {libethcore => libevmcore}/Params.h           |  2 +-
 liblll/CMakeLists.txt                         |  3 +-
 liblll/CodeFragment.h                         |  2 +-
 libsolidity/AST.h                             |  2 +-
 libsolidity/CMakeLists.txt                    |  2 +-
 libsolidity/Compiler.cpp                      |  2 +-
 libsolidity/Compiler.h                        |  2 +-
 libsolidity/CompilerContext.h                 |  2 +-
 libsolidity/Exceptions.h                      |  2 +-
 libsolidity/ExpressionCompiler.h              |  2 +-
 libsolidity/LValue.h                          |  2 +-
 libsolidity/Parser.cpp                        |  2 +-
 libsolidity/Scanner.h                         |  2 +-
 libsolidity/SourceReferenceFormatter.h        |  2 +-
 mix/CodeModel.cpp                             |  2 +-
 mix/CodeModel.h                               |  2 +-
 mix/QBasicNodeDefinition.h                    |  2 +-
 test/libsolidity/Assembly.cpp                 |  6 ++--
 test/libsolidity/SolidityOptimizer.cpp        |  6 ++--
 48 files changed, 125 insertions(+), 64 deletions(-)
 rename {libevmcore => libevmasm}/Assembly.cpp (99%)
 rename {libevmcore => libevmasm}/Assembly.h (98%)
 rename {libevmcore => libevmasm}/AssemblyItem.cpp (100%)
 rename {libevmcore => libevmasm}/AssemblyItem.h (98%)
 create mode 100644 libevmasm/CMakeLists.txt
 rename {libevmcore => libevmasm}/CommonSubexpressionEliminator.cpp (99%)
 rename {libevmcore => libevmasm}/CommonSubexpressionEliminator.h (99%)
 rename {libevmcore => libevmasm}/ControlFlowGraph.cpp (97%)
 rename {libevmcore => libevmasm}/ControlFlowGraph.h (100%)
 create mode 100644 libevmasm/Exceptions.h
 rename {libevmcore => libevmasm}/ExpressionClasses.cpp (99%)
 rename {libevmcore => libevmasm}/ExpressionClasses.h (99%)
 rename {libevmcore => libevmasm}/SemanticInformation.cpp (97%)
 rename {libevmcore => libevmasm}/SemanticInformation.h (100%)
 rename {libevmcore => libevmasm}/SourceLocation.h (100%)
 rename {libethcore => libevmcore}/Params.cpp (98%)
 rename {libethcore => libevmcore}/Params.h (99%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ff8732156..667c2fb73 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -305,6 +305,7 @@ endif()
 
 add_subdirectory(libdevcore)
 add_subdirectory(libevmcore)
+add_subdirectory(libevmasm)
 add_subdirectory(liblll)
 
 if (SERPENT)
diff --git a/alethzero/CMakeLists.txt b/alethzero/CMakeLists.txt
index 9abb3f1a4..41d9ea10f 100644
--- a/alethzero/CMakeLists.txt
+++ b/alethzero/CMakeLists.txt
@@ -55,8 +55,7 @@ target_link_libraries(${EXECUTABLE} lll)
 if (SOLIDITY)
 	target_link_libraries(${EXECUTABLE} solidity)
 endif ()
-target_link_libraries(${EXECUTABLE} evmcore)
-target_link_libraries(${EXECUTABLE} devcore)
+target_link_libraries(${EXECUTABLE} evmasm)
 target_link_libraries(${EXECUTABLE} web3jsonrpc)
 target_link_libraries(${EXECUTABLE} jsqrc)
 target_link_libraries(${EXECUTABLE} natspec)
diff --git a/evmjit/libevmjit-cpp/Env.cpp b/evmjit/libevmjit-cpp/Env.cpp
index b89aca726..2c37412fc 100644
--- a/evmjit/libevmjit-cpp/Env.cpp
+++ b/evmjit/libevmjit-cpp/Env.cpp
@@ -1,7 +1,7 @@
 
 #pragma GCC diagnostic ignored "-Wconversion"
 #include <libdevcrypto/SHA3.h>
-#include <libethcore/Params.h>
+#include <libevmcore/Params.h>
 #include <libevm/ExtVMFace.h>
 
 #include "Utils.h"
diff --git a/libethcore/BlockInfo.cpp b/libethcore/BlockInfo.cpp
index e9ce070dc..24b108ccb 100644
--- a/libethcore/BlockInfo.cpp
+++ b/libethcore/BlockInfo.cpp
@@ -23,10 +23,10 @@
 #include <libdevcore/RLP.h>
 #include <libdevcrypto/TrieDB.h>
 #include <libethcore/Common.h>
+#include <libevmcore/Params.h>
 #include "EthashAux.h"
 #include "ProofOfWork.h"
 #include "Exceptions.h"
-#include "Params.h"
 #include "BlockInfo.h"
 using namespace std;
 using namespace dev;
diff --git a/libethcore/CMakeLists.txt b/libethcore/CMakeLists.txt
index 1adb8428e..4dd626642 100644
--- a/libethcore/CMakeLists.txt
+++ b/libethcore/CMakeLists.txt
@@ -28,7 +28,7 @@ add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
 
 target_link_libraries(${EXECUTABLE} ethash)
 target_link_libraries(${EXECUTABLE} devcrypto)
-target_link_libraries(${EXECUTABLE} devcore)
+target_link_libraries(${EXECUTABLE} evmcore)
 
 if (ETHASHCL)
 	target_link_libraries(${EXECUTABLE} ethash-cl)
diff --git a/libethcore/EthashAux.cpp b/libethcore/EthashAux.cpp
index 19a96f550..36b6f1bd5 100644
--- a/libethcore/EthashAux.cpp
+++ b/libethcore/EthashAux.cpp
@@ -33,7 +33,7 @@
 #include <libdevcrypto/CryptoPP.h>
 #include <libdevcrypto/SHA3.h>
 #include <libdevcrypto/FileSystem.h>
-#include <libethcore/Params.h>
+#include <libevmcore/Params.h>
 #include "BlockInfo.h"
 using namespace std;
 using namespace chrono;
diff --git a/libethereum/Interface.h b/libethereum/Interface.h
index 6edd97b4c..e23a70f4c 100644
--- a/libethereum/Interface.h
+++ b/libethereum/Interface.h
@@ -25,7 +25,7 @@
 #include <libdevcore/CommonIO.h>
 #include <libdevcore/Guards.h>
 #include <libdevcrypto/Common.h>
-#include <libethcore/Params.h>
+#include <libevmcore/Params.h>
 #include <libethcore/ProofOfWork.h>
 #include "LogFilter.h"
 #include "Transaction.h"
diff --git a/libethereum/Precompiled.cpp b/libethereum/Precompiled.cpp
index 62d159418..0fd5cb45b 100644
--- a/libethereum/Precompiled.cpp
+++ b/libethereum/Precompiled.cpp
@@ -24,7 +24,7 @@
 #include <libdevcrypto/SHA3.h>
 #include <libdevcrypto/Common.h>
 #include <libethcore/Common.h>
-#include <libethcore/Params.h>
+#include <libevmcore/Params.h>
 using namespace std;
 using namespace dev;
 using namespace dev::eth;
diff --git a/libethereum/State.h b/libethereum/State.h
index d02521c7a..f71e68eac 100644
--- a/libethereum/State.h
+++ b/libethereum/State.h
@@ -31,7 +31,7 @@
 #include <libethcore/BlockInfo.h>
 #include <libethcore/ProofOfWork.h>
 #include <libethcore/Miner.h>
-#include <libethcore/Params.h>
+#include <libevmcore/Params.h>
 #include <libevm/ExtVMFace.h>
 #include "TransactionQueue.h"
 #include "Account.h"
diff --git a/libethereum/Transaction.h b/libethereum/Transaction.h
index 7276493c2..675bb9eb7 100644
--- a/libethereum/Transaction.h
+++ b/libethereum/Transaction.h
@@ -24,7 +24,7 @@
 #include <libdevcore/RLP.h>
 #include <libdevcrypto/SHA3.h>
 #include <libethcore/Common.h>
-#include <libethcore/Params.h>
+#include <libevmcore/Params.h>
 namespace dev
 {
 namespace eth
diff --git a/libevm/VM.h b/libevm/VM.h
index 1cf06b78b..30007e0b3 100644
--- a/libevm/VM.h
+++ b/libevm/VM.h
@@ -27,7 +27,7 @@
 #include <libevmcore/Instruction.h>
 #include <libdevcrypto/SHA3.h>
 #include <libethcore/BlockInfo.h>
-#include <libethcore/Params.h>
+#include <libevmcore/Params.h>
 #include "VMFace.h"
 
 namespace dev
diff --git a/libevmcore/Assembly.cpp b/libevmasm/Assembly.cpp
similarity index 99%
rename from libevmcore/Assembly.cpp
rename to libevmasm/Assembly.cpp
index eac946230..6cc09a4bc 100644
--- a/libevmcore/Assembly.cpp
+++ b/libevmasm/Assembly.cpp
@@ -22,8 +22,8 @@
 #include "Assembly.h"
 #include <fstream>
 #include <libdevcore/Log.h>
-#include <libevmcore/CommonSubexpressionEliminator.h>
-#include <libevmcore/ControlFlowGraph.h>
+#include <libevmasm/CommonSubexpressionEliminator.h>
+#include <libevmasm/ControlFlowGraph.h>
 #include <json/json.h>
 using namespace std;
 using namespace dev;
diff --git a/libevmcore/Assembly.h b/libevmasm/Assembly.h
similarity index 98%
rename from libevmcore/Assembly.h
rename to libevmasm/Assembly.h
index 4ac873682..b4850f7d0 100644
--- a/libevmcore/Assembly.h
+++ b/libevmasm/Assembly.h
@@ -25,9 +25,9 @@
 #include <sstream>
 #include <libdevcore/Common.h>
 #include <libdevcore/Assertions.h>
-#include <libevmcore/SourceLocation.h>
 #include <libevmcore/Instruction.h>
-#include <libevmcore/AssemblyItem.h>
+#include <libevmasm/SourceLocation.h>
+#include <libevmasm/AssemblyItem.h>
 #include "Exceptions.h"
 #include <json/json.h>
 
diff --git a/libevmcore/AssemblyItem.cpp b/libevmasm/AssemblyItem.cpp
similarity index 100%
rename from libevmcore/AssemblyItem.cpp
rename to libevmasm/AssemblyItem.cpp
diff --git a/libevmcore/AssemblyItem.h b/libevmasm/AssemblyItem.h
similarity index 98%
rename from libevmcore/AssemblyItem.h
rename to libevmasm/AssemblyItem.h
index 7400954d3..6f2a65de9 100644
--- a/libevmcore/AssemblyItem.h
+++ b/libevmasm/AssemblyItem.h
@@ -25,8 +25,8 @@
 #include <sstream>
 #include <libdevcore/Common.h>
 #include <libdevcore/Assertions.h>
-#include <libevmcore/SourceLocation.h>
 #include <libevmcore/Instruction.h>
+#include <libevmasm/SourceLocation.h>
 #include "Exceptions.h"
 
 namespace dev
diff --git a/libevmasm/CMakeLists.txt b/libevmasm/CMakeLists.txt
new file mode 100644
index 000000000..f8150806f
--- /dev/null
+++ b/libevmasm/CMakeLists.txt
@@ -0,0 +1,33 @@
+cmake_policy(SET CMP0015 NEW)
+# this policy was introduced in cmake 3.0
+# remove if, once 3.0 will be used on unix
+if (${CMAKE_MAJOR_VERSION} GREATER 2)
+	# old policy do not use MACOSX_RPATH
+	cmake_policy(SET CMP0042 OLD)
+endif()
+set(CMAKE_AUTOMOC OFF)
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSTATICLIB")
+
+aux_source_directory(. SRC_LIST)
+
+include_directories(BEFORE ${JSONCPP_INCLUDE_DIRS})
+include_directories(BEFORE ..)
+include_directories(${Boost_INCLUDE_DIRS})
+
+set(EXECUTABLE evmasm)
+
+file(GLOB HEADERS "*.h")
+
+if (ETH_STATIC)
+	add_library(${EXECUTABLE} STATIC ${SRC_LIST} ${HEADERS})
+else()
+	add_library(${EXECUTABLE} SHARED ${SRC_LIST} ${HEADERS})
+endif()
+
+target_link_libraries(${EXECUTABLE} evmcore)
+target_link_libraries(${EXECUTABLE} devcrypto)
+
+install( TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib )
+install( FILES ${HEADERS} DESTINATION include/${EXECUTABLE} )
+
diff --git a/libevmcore/CommonSubexpressionEliminator.cpp b/libevmasm/CommonSubexpressionEliminator.cpp
similarity index 99%
rename from libevmcore/CommonSubexpressionEliminator.cpp
rename to libevmasm/CommonSubexpressionEliminator.cpp
index 65305b42a..63524d6f3 100644
--- a/libevmcore/CommonSubexpressionEliminator.cpp
+++ b/libevmasm/CommonSubexpressionEliminator.cpp
@@ -24,8 +24,8 @@
 #include <functional>
 #include <boost/range/adaptor/reversed.hpp>
 #include <libdevcrypto/SHA3.h>
-#include <libevmcore/CommonSubexpressionEliminator.h>
-#include <libevmcore/AssemblyItem.h>
+#include <libevmasm/CommonSubexpressionEliminator.h>
+#include <libevmasm/AssemblyItem.h>
 
 using namespace std;
 using namespace dev;
diff --git a/libevmcore/CommonSubexpressionEliminator.h b/libevmasm/CommonSubexpressionEliminator.h
similarity index 99%
rename from libevmcore/CommonSubexpressionEliminator.h
rename to libevmasm/CommonSubexpressionEliminator.h
index 6001f1780..6156bc81a 100644
--- a/libevmcore/CommonSubexpressionEliminator.h
+++ b/libevmasm/CommonSubexpressionEliminator.h
@@ -30,8 +30,8 @@
 #include <ostream>
 #include <libdevcore/CommonIO.h>
 #include <libdevcore/Exceptions.h>
-#include <libevmcore/ExpressionClasses.h>
-#include <libevmcore/SemanticInformation.h>
+#include <libevmasm/ExpressionClasses.h>
+#include <libevmasm/SemanticInformation.h>
 
 namespace dev
 {
diff --git a/libevmcore/ControlFlowGraph.cpp b/libevmasm/ControlFlowGraph.cpp
similarity index 97%
rename from libevmcore/ControlFlowGraph.cpp
rename to libevmasm/ControlFlowGraph.cpp
index ca20a8fb0..cc4367e64 100644
--- a/libevmcore/ControlFlowGraph.cpp
+++ b/libevmasm/ControlFlowGraph.cpp
@@ -21,11 +21,11 @@
  * Control flow analysis for the optimizer.
  */
 
-#include <libevmcore/ControlFlowGraph.h>
+#include <libevmasm/ControlFlowGraph.h>
 #include <map>
-#include <libevmcore/Exceptions.h>
-#include <libevmcore/AssemblyItem.h>
-#include <libevmcore/SemanticInformation.h>
+#include <libevmasm/Exceptions.h>
+#include <libevmasm/AssemblyItem.h>
+#include <libevmasm/SemanticInformation.h>
 
 using namespace std;
 using namespace dev;
diff --git a/libevmcore/ControlFlowGraph.h b/libevmasm/ControlFlowGraph.h
similarity index 100%
rename from libevmcore/ControlFlowGraph.h
rename to libevmasm/ControlFlowGraph.h
diff --git a/libevmasm/Exceptions.h b/libevmasm/Exceptions.h
new file mode 100644
index 000000000..7cc190e41
--- /dev/null
+++ b/libevmasm/Exceptions.h
@@ -0,0 +1,36 @@
+/*
+	This file is part of cpp-ethereum.
+
+	cpp-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.
+
+	cpp-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 cpp-ethereum.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/** @file Exceptions.h
+ * @author Christian <c@ethdev.com>
+ * @date 2014
+ */
+
+#pragma once
+
+#include <libdevcore/Exceptions.h>
+
+namespace dev
+{
+namespace eth
+{
+
+struct AssemblyException: virtual Exception {};
+struct OptimizerException: virtual AssemblyException {};
+struct StackTooDeepException: virtual OptimizerException {};
+
+}
+}
diff --git a/libevmcore/ExpressionClasses.cpp b/libevmasm/ExpressionClasses.cpp
similarity index 99%
rename from libevmcore/ExpressionClasses.cpp
rename to libevmasm/ExpressionClasses.cpp
index 7c5d9ad72..1e60a7fe8 100644
--- a/libevmcore/ExpressionClasses.cpp
+++ b/libevmasm/ExpressionClasses.cpp
@@ -21,14 +21,14 @@
  * Container for equivalence classes of expressions for use in common subexpression elimination.
  */
 
-#include <libevmcore/ExpressionClasses.h>
+#include <libevmasm/ExpressionClasses.h>
 #include <utility>
 #include <tuple>
 #include <functional>
 #include <boost/range/adaptor/reversed.hpp>
 #include <boost/noncopyable.hpp>
-#include <libevmcore/Assembly.h>
-#include <libevmcore/CommonSubexpressionEliminator.h>
+#include <libevmasm/Assembly.h>
+#include <libevmasm/CommonSubexpressionEliminator.h>
 
 using namespace std;
 using namespace dev;
diff --git a/libevmcore/ExpressionClasses.h b/libevmasm/ExpressionClasses.h
similarity index 99%
rename from libevmcore/ExpressionClasses.h
rename to libevmasm/ExpressionClasses.h
index d5bf8e547..2f720f606 100644
--- a/libevmcore/ExpressionClasses.h
+++ b/libevmasm/ExpressionClasses.h
@@ -27,7 +27,7 @@
 #include <map>
 #include <memory>
 #include <libdevcore/Common.h>
-#include <libevmcore/AssemblyItem.h>
+#include <libevmasm/AssemblyItem.h>
 
 namespace dev
 {
diff --git a/libevmcore/SemanticInformation.cpp b/libevmasm/SemanticInformation.cpp
similarity index 97%
rename from libevmcore/SemanticInformation.cpp
rename to libevmasm/SemanticInformation.cpp
index 3abb26dd9..83d59efc7 100644
--- a/libevmcore/SemanticInformation.cpp
+++ b/libevmasm/SemanticInformation.cpp
@@ -21,8 +21,8 @@
  * Helper to provide semantic information about assembly items.
  */
 
-#include <libevmcore/SemanticInformation.h>
-#include <libevmcore/AssemblyItem.h>
+#include <libevmasm/SemanticInformation.h>
+#include <libevmasm/AssemblyItem.h>
 
 using namespace std;
 using namespace dev;
diff --git a/libevmcore/SemanticInformation.h b/libevmasm/SemanticInformation.h
similarity index 100%
rename from libevmcore/SemanticInformation.h
rename to libevmasm/SemanticInformation.h
diff --git a/libevmcore/SourceLocation.h b/libevmasm/SourceLocation.h
similarity index 100%
rename from libevmcore/SourceLocation.h
rename to libevmasm/SourceLocation.h
diff --git a/libevmcore/CMakeLists.txt b/libevmcore/CMakeLists.txt
index 2da76882e..83042e65e 100644
--- a/libevmcore/CMakeLists.txt
+++ b/libevmcore/CMakeLists.txt
@@ -7,11 +7,8 @@ if (${CMAKE_MAJOR_VERSION} GREATER 2)
 endif()
 set(CMAKE_AUTOMOC OFF)
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSTATICLIB")
-
 aux_source_directory(. SRC_LIST)
 
-include_directories(BEFORE ${JSONCPP_INCLUDE_DIRS})
 include_directories(BEFORE ..)
 include_directories(${Boost_INCLUDE_DIRS})
 
@@ -22,7 +19,6 @@ file(GLOB HEADERS "*.h")
 add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
 
 target_link_libraries(${EXECUTABLE} devcore)
-target_link_libraries(${EXECUTABLE} devcrypto)
 
 install( TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib )
 install( FILES ${HEADERS} DESTINATION include/${EXECUTABLE} )
diff --git a/libevmcore/Exceptions.h b/libevmcore/Exceptions.h
index fa3c19f13..72af277df 100644
--- a/libevmcore/Exceptions.h
+++ b/libevmcore/Exceptions.h
@@ -28,11 +28,8 @@ namespace dev
 namespace eth
 {
 
-struct AssemblyException: virtual Exception {};
-struct InvalidDeposit: virtual AssemblyException {};
-struct InvalidOpcode: virtual AssemblyException {};
-struct OptimizerException: virtual AssemblyException {};
-struct StackTooDeepException: virtual OptimizerException {};
+struct InvalidDeposit: virtual Exception {};
+struct InvalidOpcode: virtual Exception {};
 
 }
 }
diff --git a/libethcore/Params.cpp b/libevmcore/Params.cpp
similarity index 98%
rename from libethcore/Params.cpp
rename to libevmcore/Params.cpp
index 655c8a78b..d70cfc379 100644
--- a/libethcore/Params.cpp
+++ b/libevmcore/Params.cpp
@@ -14,7 +14,7 @@
 	You should have received a copy of the GNU General Public License
 	along with cpp-ethereum.  If not, see <http://www.gnu.org/licenses/>.
 */
-/** @file FeeStructure.cpp
+/** @file Params.cpp
  * @author Gav Wood <i@gavwood.com>
  * @date 2014
  */
diff --git a/libethcore/Params.h b/libevmcore/Params.h
similarity index 99%
rename from libethcore/Params.h
rename to libevmcore/Params.h
index b957f9737..26f12b37c 100644
--- a/libethcore/Params.h
+++ b/libevmcore/Params.h
@@ -14,7 +14,7 @@
 	You should have received a copy of the GNU General Public License
 	along with cpp-ethereum.  If not, see <http://www.gnu.org/licenses/>.
 */
-/** @file FeeStructure.h
+/** @file Params.h
  * @author Gav Wood <i@gavwood.com>
  * @date 2014
  */
diff --git a/liblll/CMakeLists.txt b/liblll/CMakeLists.txt
index d3f465f37..66f32e4d8 100644
--- a/liblll/CMakeLists.txt
+++ b/liblll/CMakeLists.txt
@@ -21,8 +21,7 @@ file(GLOB HEADERS "*.h")
 
 add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
 
-target_link_libraries(${EXECUTABLE} evmcore)
-target_link_libraries(${EXECUTABLE} devcore)
+target_link_libraries(${EXECUTABLE} evmasm)
 
 install( TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib )
 install( FILES ${HEADERS} DESTINATION include/${EXECUTABLE} )
diff --git a/liblll/CodeFragment.h b/liblll/CodeFragment.h
index 554f90b46..03f812b60 100644
--- a/liblll/CodeFragment.h
+++ b/liblll/CodeFragment.h
@@ -23,7 +23,7 @@
 
 #include <libdevcore/Common.h>
 #include <libevmcore/Instruction.h>
-#include <libevmcore/Assembly.h>
+#include <libevmasm/Assembly.h>
 #include "Exceptions.h"
 
 namespace boost { namespace spirit { class utree; } }
diff --git a/libsolidity/AST.h b/libsolidity/AST.h
index c9ad6447e..fde0b71b0 100644
--- a/libsolidity/AST.h
+++ b/libsolidity/AST.h
@@ -27,7 +27,7 @@
 #include <vector>
 #include <memory>
 #include <boost/noncopyable.hpp>
-#include <libevmcore/SourceLocation.h>
+#include <libevmasm/SourceLocation.h>
 #include <libsolidity/Utils.h>
 #include <libsolidity/ASTForward.h>
 #include <libsolidity/Token.h>
diff --git a/libsolidity/CMakeLists.txt b/libsolidity/CMakeLists.txt
index 3d31331a4..10c7bc2d2 100644
--- a/libsolidity/CMakeLists.txt
+++ b/libsolidity/CMakeLists.txt
@@ -22,7 +22,7 @@ file(GLOB HEADERS "*.h")
 add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
 
 target_link_libraries(${EXECUTABLE} ${JSONCPP_LIBRARIES})
-target_link_libraries(${EXECUTABLE} evmcore)
+target_link_libraries(${EXECUTABLE} evmasm)
 target_link_libraries(${EXECUTABLE} devcrypto)
 
 install( TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib )
diff --git a/libsolidity/Compiler.cpp b/libsolidity/Compiler.cpp
index 37b577ccd..0301375fe 100644
--- a/libsolidity/Compiler.cpp
+++ b/libsolidity/Compiler.cpp
@@ -24,7 +24,7 @@
 #include <algorithm>
 #include <boost/range/adaptor/reversed.hpp>
 #include <libevmcore/Instruction.h>
-#include <libevmcore/Assembly.h>
+#include <libevmasm/Assembly.h>
 #include <libsolidity/AST.h>
 #include <libsolidity/ExpressionCompiler.h>
 #include <libsolidity/CompilerUtils.h>
diff --git a/libsolidity/Compiler.h b/libsolidity/Compiler.h
index c3c3b9dcc..106038d1c 100644
--- a/libsolidity/Compiler.h
+++ b/libsolidity/Compiler.h
@@ -26,7 +26,7 @@
 #include <functional>
 #include <libsolidity/ASTVisitor.h>
 #include <libsolidity/CompilerContext.h>
-#include <libevmcore/Assembly.h>
+#include <libevmasm/Assembly.h>
 
 namespace dev {
 namespace solidity {
diff --git a/libsolidity/CompilerContext.h b/libsolidity/CompilerContext.h
index 0ca6369dd..933912455 100644
--- a/libsolidity/CompilerContext.h
+++ b/libsolidity/CompilerContext.h
@@ -26,7 +26,7 @@
 #include <stack>
 #include <utility>
 #include <libevmcore/Instruction.h>
-#include <libevmcore/Assembly.h>
+#include <libevmasm/Assembly.h>
 #include <libsolidity/ASTForward.h>
 #include <libsolidity/Types.h>
 #include <libdevcore/Common.h>
diff --git a/libsolidity/Exceptions.h b/libsolidity/Exceptions.h
index 0d07c7064..e5f653e1f 100644
--- a/libsolidity/Exceptions.h
+++ b/libsolidity/Exceptions.h
@@ -24,7 +24,7 @@
 
 #include <string>
 #include <libdevcore/Exceptions.h>
-#include <libevmcore/SourceLocation.h>
+#include <libevmasm/SourceLocation.h>
 
 namespace dev
 {
diff --git a/libsolidity/ExpressionCompiler.h b/libsolidity/ExpressionCompiler.h
index 35526662a..45a2311ef 100644
--- a/libsolidity/ExpressionCompiler.h
+++ b/libsolidity/ExpressionCompiler.h
@@ -25,7 +25,7 @@
 #include <memory>
 #include <boost/noncopyable.hpp>
 #include <libdevcore/Common.h>
-#include <libevmcore/SourceLocation.h>
+#include <libevmasm/SourceLocation.h>
 #include <libsolidity/Utils.h>
 #include <libsolidity/ASTVisitor.h>
 #include <libsolidity/LValue.h>
diff --git a/libsolidity/LValue.h b/libsolidity/LValue.h
index ad6225162..1617e8167 100644
--- a/libsolidity/LValue.h
+++ b/libsolidity/LValue.h
@@ -23,7 +23,7 @@
 #pragma once
 
 #include <memory>
-#include <libevmcore/SourceLocation.h>
+#include <libevmasm/SourceLocation.h>
 #include <libsolidity/ArrayUtils.h>
 
 namespace dev
diff --git a/libsolidity/Parser.cpp b/libsolidity/Parser.cpp
index 43571314a..37c358d3b 100644
--- a/libsolidity/Parser.cpp
+++ b/libsolidity/Parser.cpp
@@ -22,7 +22,7 @@
 
 #include <vector>
 #include <libdevcore/Log.h>
-#include <libevmcore/SourceLocation.h>
+#include <libevmasm/SourceLocation.h>
 #include <libsolidity/Parser.h>
 #include <libsolidity/Scanner.h>
 #include <libsolidity/Exceptions.h>
diff --git a/libsolidity/Scanner.h b/libsolidity/Scanner.h
index b57b8a189..43fcd133c 100644
--- a/libsolidity/Scanner.h
+++ b/libsolidity/Scanner.h
@@ -55,7 +55,7 @@
 #include <libdevcore/Common.h>
 #include <libdevcore/Log.h>
 #include <libdevcore/CommonData.h>
-#include <libevmcore/SourceLocation.h>
+#include <libevmasm/SourceLocation.h>
 #include <libsolidity/Token.h>
 
 namespace dev
diff --git a/libsolidity/SourceReferenceFormatter.h b/libsolidity/SourceReferenceFormatter.h
index 304e6a273..ba1077ffa 100644
--- a/libsolidity/SourceReferenceFormatter.h
+++ b/libsolidity/SourceReferenceFormatter.h
@@ -23,7 +23,7 @@
 #pragma once
 
 #include <ostream>
-#include <libevmcore/SourceLocation.h>
+#include <libevmasm/SourceLocation.h>
 
 namespace dev
 {
diff --git a/mix/CodeModel.cpp b/mix/CodeModel.cpp
index 357ce88b9..48708ac59 100644
--- a/mix/CodeModel.cpp
+++ b/mix/CodeModel.cpp
@@ -26,7 +26,7 @@
 #include <QApplication>
 #include <QtQml>
 #include <libdevcore/Common.h>
-#include <libevmcore/SourceLocation.h>
+#include <libevmasm/SourceLocation.h>
 #include <libsolidity/AST.h>
 #include <libsolidity/Types.h>
 #include <libsolidity/ASTVisitor.h>
diff --git a/mix/CodeModel.h b/mix/CodeModel.h
index 0572483c0..24ed3dcc5 100644
--- a/mix/CodeModel.h
+++ b/mix/CodeModel.h
@@ -30,7 +30,7 @@
 #include <QHash>
 #include <libdevcore/Common.h>
 #include <libdevcore/Guards.h>
-#include <libevmcore/Assembly.h>
+#include <libevmasm/Assembly.h>
 #include "SolidityType.h"
 
 class QTextDocument;
diff --git a/mix/QBasicNodeDefinition.h b/mix/QBasicNodeDefinition.h
index 9179905eb..6a327b734 100644
--- a/mix/QBasicNodeDefinition.h
+++ b/mix/QBasicNodeDefinition.h
@@ -23,7 +23,7 @@
 
 #include <string>
 #include <QObject>
-#include <libevmcore/SourceLocation.h>
+#include <libevmasm/SourceLocation.h>
 
 namespace dev
 {
diff --git a/test/libsolidity/Assembly.cpp b/test/libsolidity/Assembly.cpp
index 8dcee7fb5..ccc4bf811 100644
--- a/test/libsolidity/Assembly.cpp
+++ b/test/libsolidity/Assembly.cpp
@@ -17,20 +17,20 @@
 /**
  * @author Lefteris Karapetsas <lefteris@ethdev.com>
  * @date 2015
- * Unit tests for Assembly Items from evmcore/Assembly.h
+ * Unit tests for Assembly Items from evmasm/Assembly.h
  */
 
 #include <string>
 #include <iostream>
 #include <boost/test/unit_test.hpp>
 #include <libdevcore/Log.h>
-#include <libevmcore/SourceLocation.h>
+#include <libevmasm/SourceLocation.h>
+#include <libevmasm/Assembly.h>
 #include <libsolidity/Scanner.h>
 #include <libsolidity/Parser.h>
 #include <libsolidity/NameAndTypeResolver.h>
 #include <libsolidity/Compiler.h>
 #include <libsolidity/AST.h>
-#include <libevmcore/Assembly.h>
 
 using namespace std;
 using namespace dev::eth;
diff --git a/test/libsolidity/SolidityOptimizer.cpp b/test/libsolidity/SolidityOptimizer.cpp
index ceb9c68d9..9cdaa5886 100644
--- a/test/libsolidity/SolidityOptimizer.cpp
+++ b/test/libsolidity/SolidityOptimizer.cpp
@@ -26,9 +26,9 @@
 #include <boost/test/unit_test.hpp>
 #include <boost/lexical_cast.hpp>
 #include <test/libsolidity/solidityExecutionFramework.h>
-#include <libevmcore/CommonSubexpressionEliminator.h>
-#include <libevmcore/ControlFlowGraph.h>
-#include <libevmcore/Assembly.h>
+#include <libevmasm/CommonSubexpressionEliminator.h>
+#include <libevmasm/ControlFlowGraph.h>
+#include <libevmasm/Assembly.h>
 
 using namespace std;
 using namespace dev::eth;