Merge pull request ethereum#4905 from ethereum/interpreter

Interpreter using EVM-C
satakwwl · Mar 23, 2018 · 3888ded · 3888ded
2 parents fe4633e + e1699d2
commit 3888ded
Show file tree

Hide file tree

Showing 8 changed files with 429 additions and 238 deletions.
diff --git a/circle.yml b/circle.yml
@@ -109,6 +109,12 @@ defaults:
     - *store-testeth
     - *restore-ethash-dag
     - *test
+    - run:
+        name: "Test EVM-C Interpreter"
+        working_directory: ~/build
+        command: |
+          ETHEREUM_TEST_PATH=~/project/test/jsontests \
+          test/testeth -t GeneralStateTests -- --vm interpreter
     - *save-ethash-dag
     - *upload-coverage-data
 

diff --git a/libevm/CMakeLists.txt b/libevm/CMakeLists.txt
@@ -1,7 +1,9 @@
 
 set(sources
+    EVMC.cpp EVMC.h
     ExtVMFace.cpp ExtVMFace.h
     Instruction.cpp Instruction.h
+    interpreter.h
     LegacyVM.cpp LegacyVM.h
     LegacyVMCalls.cpp
     LegacyVMOpt.cpp
@@ -15,12 +17,6 @@ set(sources
     VMFactory.cpp VMFactory.h
 )
 
-if(EVMJIT OR HERA)
-    list(APPEND sources
-        EVMC.cpp EVMC.h
-    )
-endif()
-
 add_library(evm ${sources})
 
 target_link_libraries(evm PUBLIC ethcore devcore PRIVATE jsoncpp_lib_static Boost::program_options)