Move assembly related files to libevmasm and Params.h/.cpp to libevmcore.

CMakeLists.txt

@@ -305,6 +305,7 @@ endif()
 
 add_subdirectory(libdevcore)
 add_subdirectory(libevmcore)
+add_subdirectory(libevmasm)
 add_subdirectory(liblll)
 
 if (SERPENT)

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} evmasm)
-target_link_libraries(${EXECUTABLE} devcore)
 target_link_libraries(${EXECUTABLE} web3jsonrpc)
 target_link_libraries(${EXECUTABLE} jsqrc)
 target_link_libraries(${EXECUTABLE} natspec)

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"

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;

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)

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;

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"

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;

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"

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

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

libevmcore/Assembly.cpp → libevmasm/Assembly.cpp

@@ -22,8 +22,8 @@
 #include "Assembly.h"
 #include <fstream>
 #include <libdevcore/Log.h>
-#include <libevmcore/CommonSubexpressionEliminator.h>
+#include <libevmasm/CommonSubexpressionEliminator.h>
-#include <libevmcore/ControlFlowGraph.h>
+#include <libevmasm/ControlFlowGraph.h>
 #include <json/json.h>
 using namespace std;
 using namespace dev;

libevmcore/Assembly.h → 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>
 

libevmcore/AssemblyItem.h → 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

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} )
+

libevmcore/CommonSubexpressionEliminator.cpp → libevmasm/CommonSubexpressionEliminator.cpp

@@ -24,8 +24,8 @@
 #include <functional>
 #include <boost/range/adaptor/reversed.hpp>
 #include <libdevcrypto/SHA3.h>
-#include <libevmcore/CommonSubexpressionEliminator.h>
+#include <libevmasm/CommonSubexpressionEliminator.h>
-#include <libevmcore/AssemblyItem.h>
+#include <libevmasm/AssemblyItem.h>
 
 using namespace std;
 using namespace dev;

libevmcore/CommonSubexpressionEliminator.h → libevmasm/CommonSubexpressionEliminator.h

@@ -30,8 +30,8 @@
 #include <ostream>
 #include <libdevcore/CommonIO.h>
 #include <libdevcore/Exceptions.h>
-#include <libevmcore/ExpressionClasses.h>
+#include <libevmasm/ExpressionClasses.h>
-#include <libevmcore/SemanticInformation.h>
+#include <libevmasm/SemanticInformation.h>
 
 namespace dev
 {

libevmcore/ControlFlowGraph.cpp → 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 <libevmasm/Exceptions.h>
-#include <libevmcore/AssemblyItem.h>
+#include <libevmasm/AssemblyItem.h>
-#include <libevmcore/SemanticInformation.h>
+#include <libevmasm/SemanticInformation.h>
 
 using namespace std;
 using namespace dev;

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 {};
+
+}
+}

libevmcore/ExpressionClasses.cpp → 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 <libevmasm/Assembly.h>
-#include <libevmcore/CommonSubexpressionEliminator.h>
+#include <libevmasm/CommonSubexpressionEliminator.h>
 
 using namespace std;
 using namespace dev;

libevmcore/ExpressionClasses.h → 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
 {

libevmcore/SemanticInformation.cpp → libevmasm/SemanticInformation.cpp

@@ -21,8 +21,8 @@
  * Helper to provide semantic information about assembly items.
  */
 
-#include <libevmcore/SemanticInformation.h>
+#include <libevmasm/SemanticInformation.h>
-#include <libevmcore/AssemblyItem.h>
+#include <libevmasm/AssemblyItem.h>
 
 using namespace std;
 using namespace dev;

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} )

libevmcore/Exceptions.h

@@ -28,11 +28,8 @@ namespace dev
 namespace eth
 {
 
-struct AssemblyException: virtual Exception {};
+struct InvalidDeposit: virtual Exception {};
-struct InvalidDeposit: virtual AssemblyException {};
+struct InvalidOpcode: virtual Exception {};
-struct InvalidOpcode: virtual AssemblyException {};
-struct OptimizerException: virtual AssemblyException {};
-struct StackTooDeepException: virtual OptimizerException {};
 
 }
 }

libethcore/Params.cpp → 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
  */

libethcore/Params.h → 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
  */

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} evmasm)
-target_link_libraries(${EXECUTABLE} devcore)
 
 install( TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib )
 install( FILES ${HEADERS} DESTINATION include/${EXECUTABLE} )

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; } }

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>

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 )

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>

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 {

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>

libsolidity/Exceptions.h

@@ -24,7 +24,7 @@
 
 #include <string>
 #include <libdevcore/Exceptions.h>
-#include <libevmcore/SourceLocation.h>
+#include <libevmasm/SourceLocation.h>
 
 namespace dev
 {

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>

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

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>

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

libsolidity/SourceReferenceFormatter.h

@@ -23,7 +23,7 @@
 #pragma once
 
 #include <ostream>
-#include <libevmcore/SourceLocation.h>
+#include <libevmasm/SourceLocation.h>
 
 namespace dev
 {

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>

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;

mix/QBasicNodeDefinition.h

@@ -23,7 +23,7 @@
 
 #include <string>
 #include <QObject>
-#include <libevmcore/SourceLocation.h>
+#include <libevmasm/SourceLocation.h>
 
 namespace dev
 {

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;

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 <libevmasm/CommonSubexpressionEliminator.h>
-#include <libevmcore/ControlFlowGraph.h>
+#include <libevmasm/ControlFlowGraph.h>
-#include <libevmcore/Assembly.h>
+#include <libevmasm/Assembly.h>
 
 using namespace std;
 using namespace dev::eth;