Pull Request #532: Essential fixes for EVMc Java bindings

ethereum · Aug 9, 2020 · 4fbc359 · 4fbc359
2 parents 625d7a9 + c21fd02
commit 4fbc359
Show file tree

Hide file tree

Showing 8 changed files with 371 additions and 406 deletions.
diff --git a/bindings/java/Makefile b/bindings/java/Makefile
@@ -22,6 +22,9 @@ $(OUT_DIR)/lib/libevmc-java.so:
  mkdir -p $(BUILD_DIR)
  (cd $(BUILD_DIR) && cmake $(SOURCE_DIR) -DCMAKE_INSTALL_PREFIX=$(OUT_DIR) -DEVMC_JAVA=ON -DJAVA_HOME=$(JAVA_HOME) -DEVMC_EXAMPLES=ON)
  cmake --build $(OUT_DIR)/_cmake_build --target install
+ mkdir -p $(CURDIR)/java/src/test/resources
+ cp $(OUT_DIR)/lib/libevmc-java.so $(CURDIR)/java/src/test/resources/libevmc.so
+ cp $(OUT_DIR)/lib/libexample-vm.so $(CURDIR)/java/src/test/resources/libexample-vm.so
 
 clean:
  rm -rf $(OUT_DIR)

diff --git a/bindings/java/c/evmc-vm.c b/bindings/java/c/evmc-vm.c
@@ -138,6 +138,15 @@ JNIEXPORT jint JNICALL Java_org_ethereum_evmc_EvmcVm_set_1option(JNIEnv* jenv,
  return (jint)option_result;
 }
 
+JNIEXPORT jlong JNICALL Java_org_ethereum_evmc_EvmcVm_address(JNIEnv* jenv,
+ jclass jcls,
+ jobject buf)
+{
+ (void)jcls;
+ void* p = (*jenv)->GetDirectBufferAddress(jenv, buf);
+ return (jlong)p;
+}
+
 JNIEXPORT jint JNICALL Java_org_ethereum_evmc_EvmcVm_get_1result_1size(JNIEnv* jenv, jclass jcls)
 {
  (void)jenv;