Merge pull request #192 from ewasm/upgrade-evmc

Upgrade EVMC
ewasm · Apr 24, 2018 · a6c07f9 · a6c07f9
2 parents 91d902f + 9a148fa
commit a6c07f9
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 14 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -13,7 +13,6 @@ project(hera)
 
 include(ProjectBinaryen)
 
-option(EVMC_BUILD_EXAMPLES "Build EVMC examples" OFF)
 add_subdirectory(evmc)
 
 add_subdirectory(src)
diff --git a/circle.yml b/circle.yml
@@ -45,7 +45,7 @@ defaults:
 
   save-eth-cache: &save-eth-cache
     save_cache:
-      key: &eth-cache-key cpp-prebuilt-cache-{{arch}}-{{checksum "compiler.version"}}-a17f30a41aa2af506b6b453f052c53bd323a36e0
+      key: &eth-cache-key cpp-prebuilt-cache-{{arch}}-{{checksum "compiler.version"}}-d658b3ae8195baaa328a213913c47274ce87296d
       paths:
         - ~/build
         - ~/.hunter
@@ -60,9 +60,9 @@ defaults:
       working_directory: ~/project
       command: |
         cd ..
-        git clone https://github.com/ethereum/cpp-ethereum --branch develop --single-branch
+        git clone https://github.com/ethereum/cpp-ethereum --branch upgrade-evmc --single-branch
         cd cpp-ethereum
-        git reset --hard a17f30a41aa2af506b6b453f052c53bd323a36e0
+        git reset --hard d658b3ae8195baaa328a213913c47274ce87296d
         git submodule update --init
 
   link-hera: &link-hera

diff --git a/evmc b/evmc
diff --git a/src/eei.h b/src/eei.h
@@ -26,7 +26,7 @@
 
 #include <wasm.h>
 #include <wasm-binary.h>
-#include <evmc.h>
+#include <evmc/evmc.h>
 #include "shell-interface.h"
 #include "hera.h"
 #include "exceptions.h"

diff --git a/src/hera.cpp b/src/hera.cpp
@@ -37,7 +37,7 @@
 #include <wasm-printing.h>
 #include <wasm-validator.h>
 
-#include <evmc.h>
+#include <evmc/evmc.h>
 
 #include "hera.h"
 #include "eei.h"
@@ -54,7 +54,7 @@ struct hera_instance : evmc_instance {
   bool use_evm2wasm_js_trace = false;
 #endif
 
-  hera_instance() : evmc_instance({EVMC_ABI_VERSION, nullptr, nullptr, nullptr}) {}
+  hera_instance() : evmc_instance({EVMC_ABI_VERSION, "hera", "0.0.0", nullptr, nullptr, nullptr}) {}
 };
 
 namespace {
@@ -344,7 +344,7 @@ evmc_result hera_execute(
   } catch (OutOfGasException const&) {
     ret.status_code = EVMC_OUT_OF_GAS;
   } catch (StaticModeViolation const& e) {
-    ret.status_code = EVMC_STATIC_MODE_ERROR;
+    ret.status_code = EVMC_STATIC_MODE_VIOLATION;
 #if HERA_DEBUGGING
     cerr << e.what() << endl;
 #endif
@@ -404,13 +404,13 @@ void hera_destroy(evmc_instance* instance)
 
 extern "C" {
 
-evmc_instance* hera_create()
+evmc_instance* evmc_create_hera()
 {
   hera_instance* instance = new hera_instance;
   instance->destroy = hera_destroy;
   instance->execute = hera_execute;
   instance->set_option = hera_set_option;
-  return static_cast<evmc_instance*>(instance);
+  return instance;
 }
 
 }
diff --git a/src/hera.h b/src/hera.h
@@ -25,6 +25,8 @@
 #ifndef __HERA_H
 #define __HERA_H
 
+#include <evmc/evmc.h>
+
 #if defined _MSC_VER || defined __MINGW32__
 # define HERA_EXPORT __declspec(dllexport)
 # define HERA_IMPORT __declspec(dllimport)
@@ -40,10 +42,8 @@
 extern "C" {
 #endif
 
-struct evm_instance;
-
 HERA_EXPORT
-struct evmc_instance* hera_create(void);
+struct evmc_instance* evmc_create_hera(void);
 
 #if __cplusplus
 }
+44 −1		CMakeLists.txt
+1 −1		Doxyfile
+13 −2		README.md
+19 −1		circle.yml
+79 −0		cmake/cable/CableBuildInfo.cmake
+43 −0		cmake/cable/CableBuildType.cmake
+106 −0		cmake/cable/CableCompilerSettings.cmake
+23 −0		cmake/cable/CableToolchains.cmake
+543 −0		cmake/cable/HunterGate.cmake
+202 −0		cmake/cable/LICENSE
+66 −0		cmake/cable/bootstrap.cmake
+20 −0		cmake/cable/buildinfo/buildinfo.c.in
+25 −0		cmake/cable/buildinfo/buildinfo.cmake
+28 −0		cmake/cable/buildinfo/buildinfo.h.in
+26 −0		cmake/cable/buildinfo/gitinfo.cmake
+17 −0		cmake/cable/defaults/HunterCacheServers-passwords.cmake
+26 −0		cmake/cable/defaults/HunterCacheServers.cmake
+9 −0		cmake/cable/toolchains/cxx11-32bit.cmake
+6 −0		cmake/cable/toolchains/cxx11.cmake
+2 −0		cmake/cable/toolchains/default.cmake
+23 −0		cmake/cable/toolchains/mips64.cmake
+6 −5		examples/CMakeLists.txt
+4 −4		examples/capi.c
+14 −0		examples/examplevm/CMakeLists.txt
+21 −22		examples/examplevm/examplevm.c
+13 −0		examples/examplevm/examplevm.h
+124 −48		include/evmc/evmc.h
+5 −0		test/CMakeLists.txt
+49 −0		test/vmtester/CMakeLists.txt
+63 −0		test/vmtester/tests.cpp
+91 −0		test/vmtester/vmtester.cpp
+23 −0		test/vmtester/vmtester.hpp