Move interpreter to its own aleth-interpreter library

ethereum · Jun 20, 2018 · df51734 · df51734
1 parent bcc98a3
commit df51734
Show file tree

Hide file tree

Showing 18 changed files with 27 additions and 18 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -123,6 +123,8 @@ endif()
 #Global include path for all libs.
 include_directories("${CMAKE_SOURCE_DIR}")
 
+add_subdirectory(libaleth-interpreter)
+
 add_subdirectory(libdevcore)
 add_subdirectory(libdevcrypto)
 add_subdirectory(libp2p)

diff --git a/aleth-vm/main.cpp b/aleth-vm/main.cpp
@@ -28,7 +28,6 @@
 #include <libethereum/ChainParams.h>
 #include <libethereum/Executive.h>
 #include <libethereum/LastBlockHashesFace.h>
-#include <libevm/VM.h>
 #include <libevm/VMFactory.h>
 
 #include <aleth-buildinfo.h>

diff --git a/aleth/main.cpp b/aleth/main.cpp
@@ -40,7 +40,6 @@
 #include <libethereum/Defaults.h>
 #include <libethereum/SnapshotImporter.h>
 #include <libethereum/SnapshotStorage.h>
-#include <libevm/VM.h>
 #include <libevm/VMFactory.h>
 #include <libwebthree/WebThree.h>
 

diff --git a/libaleth-interpreter/CMakeLists.txt b/libaleth-interpreter/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Aleth: Ethereum C++ client, tools and libraries.
+# Copyright 2018 Aleth Autors.
+# Licensed under the GNU General Public License, Version 3. See the LICENSE file.
+
+add_library(
+    aleth-interpreter
+    interpreter.h
+    VM.cpp
+    VM.h
+    VMCalls.cpp
+    VMConfig.h
+    VMOpt.cpp
+    VMSIMD.cpp
+    VMValidate.cpp
+)
+target_link_libraries(aleth-interpreter PRIVATE devcore aleth-buildinfo evmc::evmc evmc::instructions)
diff --git a/libevm/VM.cpp → libaleth-interpreter/VM.cpp b/libevm/VM.cpp → libaleth-interpreter/VM.cpp
diff --git a/libevm/VM.h → libaleth-interpreter/VM.h b/libevm/VM.h → libaleth-interpreter/VM.h
@@ -17,9 +17,10 @@
 
 #pragma once
 
-#include "Instruction.h"
 #include "VMConfig.h"
-#include "VMFace.h"
+
+#include <libevm/VMFace.h>
+#include <libevm/Instruction.h>
 
 #include <evmc/evmc.h>
 #include <evmc/instructions.h>

diff --git a/libevm/VMCalls.cpp → libaleth-interpreter/VMCalls.cpp b/libevm/VMCalls.cpp → libaleth-interpreter/VMCalls.cpp
diff --git a/libevm/VMConfig.h → libaleth-interpreter/VMConfig.h b/libevm/VMConfig.h → libaleth-interpreter/VMConfig.h
diff --git a/libevm/VMOpt.cpp → libaleth-interpreter/VMOpt.cpp b/libevm/VMOpt.cpp → libaleth-interpreter/VMOpt.cpp
diff --git a/libevm/VMSIMD.cpp → libaleth-interpreter/VMSIMD.cpp b/libevm/VMSIMD.cpp → libaleth-interpreter/VMSIMD.cpp
diff --git a/libevm/VMValidate.cpp → libaleth-interpreter/VMValidate.cpp b/libevm/VMValidate.cpp → libaleth-interpreter/VMValidate.cpp
diff --git a/libevm/interpreter.h → libaleth-interpreter/interpreter.h b/libevm/interpreter.h → libaleth-interpreter/interpreter.h
diff --git a/libevm/CMakeLists.txt b/libevm/CMakeLists.txt
@@ -3,26 +3,19 @@ set(sources
     EVMC.cpp EVMC.h
     ExtVMFace.cpp ExtVMFace.h
     Instruction.cpp Instruction.h
-    interpreter.h
     LegacyVM.cpp LegacyVM.h
     LegacyVMCalls.cpp
     LegacyVMOpt.cpp
     VMFace.h
-    VMConfig.h
-    VM.cpp VM.h
-    VMCalls.cpp
-    VMOpt.cpp
-    VMSIMD.cpp
-    VMValidate.cpp
     VMFactory.cpp VMFactory.h
 )
 
 add_library(evm ${sources})
 
 target_link_libraries(
     evm
-    PUBLIC ethcore devcore evmc::evmc evmc::instructions
-    PRIVATE aleth-buildinfo jsoncpp_lib_static Boost::program_options ${CMAKE_DL_LIBS}
+    PUBLIC ethcore devcore evmc::evmc
+    PRIVATE aleth-interpreter aleth-buildinfo jsoncpp_lib_static Boost::program_options ${CMAKE_DL_LIBS}
 )
 
 if(EVM_OPTIMIZE)

diff --git a/libevm/EVMC.cpp b/libevm/EVMC.cpp
@@ -4,7 +4,6 @@
 #include "EVMC.h"
 
 #include <libdevcore/Log.h>
-#include <libevm/VM.h>
 #include <libevm/VMFactory.h>
 
 namespace dev

diff --git a/libevm/LegacyVM.h b/libevm/LegacyVM.h
@@ -18,9 +18,10 @@
 #pragma once
 
 #include "Instruction.h"
-#include "VMConfig.h"
 #include "VMFace.h"
 
+#include <libaleth-interpreter/VMConfig.h>
+
 namespace dev
 {
 namespace eth

diff --git a/libevm/VMFactory.cpp b/libevm/VMFactory.cpp
@@ -18,7 +18,8 @@
 #include "VMFactory.h"
 #include "EVMC.h"
 #include "LegacyVM.h"
-#include "interpreter.h"
+
+#include <libaleth-interpreter/interpreter.h>
 
 #include <boost/dll.hpp>
 #include <boost/filesystem.hpp>

diff --git a/test/tools/jsontests/StateTests.cpp b/test/tools/jsontests/StateTests.cpp
@@ -29,7 +29,6 @@
 #include <libethereum/State.h>
 #include <libethereum/ExtVM.h>
 #include <libethereum/Defaults.h>
-#include <libevm/VM.h>
 #include <test/tools/libtesteth/TestHelper.h>
 #include <test/tools/libtesteth/TestSuite.h>
 #include <test/tools/jsontests/StateTests.h>

diff --git a/test/tools/jsontests/vm.h b/test/tools/jsontests/vm.h
@@ -27,7 +27,6 @@ along with cpp-ethereum.  If not, see <http://www.gnu.org/licenses/>.
 #include <libdevcore/Log.h>
 #include <libdevcore/CommonIO.h>
 #include <libevm/ExtVMFace.h>
-#include <libevm/VM.h>
 #include <libethereum/Transaction.h>
 #include <libethereum/ExtVM.h>
 #include <libethereum/State.h>