java for pyeos in progress

Author: learnforpractice

Diff for: .gitignore

@@ -1,3 +1,4 @@
+*.class
 deps
 bridge.go
 _obj

Diff for: libraries/vm/vm_java/CMakeLists.txt

@@ -19,29 +19,29 @@ set(RT_JAR_PATH "${RT_JAR_PATH}/../jre/lib/rt.jar")
 set(JAVA_LIB "$ENV{JAVA_HOME}/lib/server/libjvm.dylib")
 
 add_custom_command(
-    OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/VMMain.h
-    COMMAND javac -h ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/VMMain.java
-    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/VMMain.java
+    OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/NativeInterface.h
+    COMMAND javac -h ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/VMJava.java
+    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/VMJava.java
 )
 
 add_custom_command(
-    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/VMMain.jar
-    COMMAND jar cvfm ${CMAKE_CURRENT_BINARY_DIR}/VMMain.jar ${CMAKE_CURRENT_SOURCE_DIR}/manifest.txt ${CMAKE_CURRENT_BINARY_DIR}/*.class
-    DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/VMMain.class ${CMAKE_CURRENT_SOURCE_DIR}/manifest.txt
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/VMJava.jar
+    COMMAND jar cvfm ${CMAKE_CURRENT_BINARY_DIR}/VMJava.jar ${CMAKE_CURRENT_SOURCE_DIR}/manifest.txt ${CMAKE_CURRENT_BINARY_DIR}/*.class
+    DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/VMJava.class ${CMAKE_CURRENT_SOURCE_DIR}/manifest.txt
 )
 
 add_custom_command(
-    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/VMMain.class
-    COMMAND javac -d ${CMAKE_CURRENT_BINARY_DIR} -source 1.6 -target 1.6 -bootclasspath ${RT_JAR_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/VMMain.java
-    DEPENDS  ${CMAKE_CURRENT_SOURCE_DIR}/VMMain.java
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/VMJava.class
+    COMMAND javac -d ${CMAKE_CURRENT_BINARY_DIR} -source 1.6 -target 1.6 -bootclasspath ${RT_JAR_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/VMJava.java
+    DEPENDS  ${CMAKE_CURRENT_SOURCE_DIR}/VMJava.java
 )
 
 add_library(vm_java SHARED 
             vm_java.cpp
-            VMMain.cpp
+            NativeInterface.cpp
             inspector.cpp
-            ${CMAKE_CURRENT_SOURCE_DIR}/VMMain.h
-            ${CMAKE_CURRENT_BINARY_DIR}/VMMain.jar
+            ${CMAKE_CURRENT_SOURCE_DIR}/NativeInterface.h
+            ${CMAKE_CURRENT_BINARY_DIR}/VMJava.jar
             )
 
 target_link_libraries(vm_java PRIVATE eosiolib_native ${JAVA_LIB})

Diff for: libraries/vm/vm_java/VMMain.cpp renamed to libraries/vm/vm_java/NativeInterface.cpp

@@ -1,4 +1,4 @@
-#include "VMMain.h"
+#include "NativeInterface.h"
 #include <stdio.h>
 #include <string.h>
 #include <eosiolib_native/vm_api.h>
@@ -8,18 +8,20 @@
  * Method:    sayHello
  * Signature: ()V
  */
-JNIEXPORT void JNICALL Java_VMMain_sayHello(JNIEnv *env, jobject jobj) {
+JNIEXPORT void JNICALL Java_NativeInterface_sayHello(JNIEnv *env, jclass jobj) {
    printf("++++++++++++++hello,world\n");
 }
 
-JNIEXPORT jbyteArray JNICALL Java_VMMain_get_1code
-  (JNIEnv *env, jobject o, jlong account) {
+JNIEXPORT jbyteArray JNICALL Java_NativeInterface_get_1code
+  (JNIEnv *env, jclass o, jlong account) {
+   printf("++++Java_NativeInterface_get_1code %llu %d\n", account, sizeof(jlong));
    if (get_vm_api()->get_code_type(account) != VM_TYPE_JAVA) {
       return NULL;
    }
    size_t len = 0;
    const char* code = get_vm_api()->get_code(account, &len);
-   jbyteArray jarr = env->NewByteArray(10);
+   printf("+++code size: %d \n", len);
+   jbyteArray jarr = env->NewByteArray(len);
    env->SetByteArrayRegion(jarr, 0, len, (jbyte*)code);
    return jarr;
 }
@@ -29,8 +31,8 @@ JNIEXPORT jbyteArray JNICALL Java_VMMain_get_1code
  * Method:    is_account
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_VMMain_is_1account
-  (JNIEnv *, jobject, jlong account){
+JNIEXPORT jboolean JNICALL Java_NativeInterface_is_1account
+  (JNIEnv *, jclass, jlong account){
    return is_account((uint64_t)account);
 }
 
@@ -39,23 +41,28 @@ JNIEXPORT jboolean JNICALL Java_VMMain_is_1account
  * Method:    s2n
  * Signature: (Ljava/lang/String;)J
  */
-JNIEXPORT jlong JNICALL Java_VMMain_s2n
-  (JNIEnv *env, jobject o, jstring str){
+JNIEXPORT jlong JNICALL Java_NativeInterface_s2n
+  (JNIEnv *env, jclass o, jstring str){
    jboolean isCopy = false;
    const char* _str = env->GetStringUTFChars(str, &isCopy);
    printf("+++++++++isCopy %d %s\n", isCopy, _str);
-   return get_vm_api()->string_to_uint64(_str);
+   uint64_t n = get_vm_api()->string_to_uint64(_str);
+   if (isCopy) {
+      env->ReleaseStringUTFChars(str, _str);
+   }
+   return (jlong)n;
 }
 
 /*
  * Class:     VMMain
  * Method:    n2s
  * Signature: (J)Ljava/lang/String;
  */
-JNIEXPORT jstring JNICALL Java_VMMain_n2s
-  (JNIEnv *env, jobject o, jlong account){
+JNIEXPORT jstring JNICALL Java_NativeInterface_n2s
+  (JNIEnv *env, jclass o, jlong account){
    char name[32];
    memset(name, 0, sizeof(name));
+   printf("+++++Java_NativeInterface_n2s %llu\n", account);
    get_vm_api()->uint64_to_string(account, name, sizeof(name));
    return env->NewStringUTF(name);
 }
@@ -65,8 +72,8 @@ JNIEXPORT jstring JNICALL Java_VMMain_n2s
  * Method:    action_data_size
  * Signature: ()I
  */
-JNIEXPORT jint JNICALL Java_VMMain_action_1data_1size
-  (JNIEnv *env, jobject o){
+JNIEXPORT jint JNICALL Java_NativeInterface_action_1data_1size
+  (JNIEnv *env, jclass o){
    return action_data_size();
 }
 
@@ -75,13 +82,13 @@ JNIEXPORT jint JNICALL Java_VMMain_action_1data_1size
  * Method:    read_action_data
  * Signature: ()[B
  */
-JNIEXPORT jbyteArray JNICALL Java_VMMain_read_1action_1data
-  (JNIEnv *env, jobject){
+JNIEXPORT jbyteArray JNICALL Java_NativeInterface_read_1action_1data
+  (JNIEnv *env, jclass){
    uint32_t size = action_data_size();
    char *buf = new char[size];
    read_action_data(buf, size);
 
-   jbyteArray jarr = env->NewByteArray(10);
+   jbyteArray jarr = env->NewByteArray(size);
    env->SetByteArrayRegion(jarr, 0, size, (jbyte*) buf);
    delete[] buf;
    return jarr;
@@ -92,8 +99,8 @@ JNIEXPORT jbyteArray JNICALL Java_VMMain_read_1action_1data
  * Method:    require_recipient
  * Signature: (J)V
  */
-JNIEXPORT void JNICALL Java_VMMain_require_1recipient
-  (JNIEnv *, jobject, jlong account){
+JNIEXPORT void JNICALL Java_NativeInterface_require_1recipient
+  (JNIEnv *, jclass, jlong account){
    require_recipient(account);
 }
 
@@ -102,8 +109,8 @@ JNIEXPORT void JNICALL Java_VMMain_require_1recipient
  * Method:    require_auth
  * Signature: (J)V
  */
-JNIEXPORT void JNICALL Java_VMMain_require_1auth
-  (JNIEnv *, jobject, jlong account){
+JNIEXPORT void JNICALL Java_NativeInterface_require_1auth
+  (JNIEnv *, jclass, jlong account){
    require_auth(account);
 }
 
@@ -112,8 +119,8 @@ JNIEXPORT void JNICALL Java_VMMain_require_1auth
  * Method:    db_store_i64
  * Signature: (JJJJ[B)I
  */
-JNIEXPORT jint JNICALL Java_VMMain_db_1store_1i64
-  (JNIEnv *env, jobject, jlong scope, jlong table_id, jlong payer, jlong id, jbyteArray jdata){
+JNIEXPORT jint JNICALL Java_NativeInterface_db_1store_1i64
+  (JNIEnv *env, jclass, jlong scope, jlong table_id, jlong payer, jlong id, jbyteArray jdata){
 
    jsize len = env->GetArrayLength(jdata);
    char* buf = new char[len];
@@ -129,8 +136,8 @@ JNIEXPORT jint JNICALL Java_VMMain_db_1store_1i64
  * Method:    db_update_i64
  * Signature: (I[B)V
  */
-JNIEXPORT void JNICALL Java_VMMain_db_1update_1i64
-  (JNIEnv *env, jobject, jint itr, jlong payer, jbyteArray jdata){
+JNIEXPORT void JNICALL Java_NativeInterface_db_1update_1i64
+  (JNIEnv *env, jclass, jint itr, jlong payer, jbyteArray jdata){
 
    jsize len = env->GetArrayLength(jdata);
    char* buf = new char[len];
@@ -145,8 +152,8 @@ JNIEXPORT void JNICALL Java_VMMain_db_1update_1i64
  * Method:    db_remove_i64
  * Signature: (I)V
  */
-JNIEXPORT void JNICALL Java_VMMain_db_1remove_1i64
-  (JNIEnv *, jobject, jint itr){
+JNIEXPORT void JNICALL Java_NativeInterface_db_1remove_1i64
+  (JNIEnv *, jclass, jint itr){
    db_remove_i64(itr);
 }
 
@@ -155,16 +162,16 @@ JNIEXPORT void JNICALL Java_VMMain_db_1remove_1i64
  * Method:    db_get_i64
  * Signature: (I)[B
  */
-JNIEXPORT jbyteArray JNICALL Java_VMMain_db_1get_1i64
-  (JNIEnv *env, jobject o, jint itr){
+JNIEXPORT jbyteArray JNICALL Java_NativeInterface_db_1get_1i64
+  (JNIEnv *env, jclass o, jint itr){
    int size = db_get_i64(itr, nullptr, 0);
    if (size == 0) {
       return NULL;
    }
    char *buf = new char[size];
    db_get_i64(itr, buf, size);
 
-   jbyteArray jarr = env->NewByteArray(10);
+   jbyteArray jarr = env->NewByteArray(size);
    env->SetByteArrayRegion(jarr, 0, size, (jbyte*) buf);
    return jarr;
 }
@@ -174,8 +181,8 @@ JNIEXPORT jbyteArray JNICALL Java_VMMain_db_1get_1i64
  * Method:    db_next_i64
  * Signature: (I)J
  */
-JNIEXPORT jlong JNICALL Java_VMMain_db_1next_1i64
-  (JNIEnv *, jobject, jint itr){
+JNIEXPORT jlong JNICALL Java_NativeInterface_db_1next_1i64
+  (JNIEnv *, jclass, jint itr){
    uint64_t primary = 0;
    return db_next_i64(itr, &primary);
 }
@@ -185,8 +192,8 @@ JNIEXPORT jlong JNICALL Java_VMMain_db_1next_1i64
  * Method:    db_previous_i64
  * Signature: (I)J
  */
-JNIEXPORT jlong JNICALL Java_VMMain_db_1previous_1i64
-  (JNIEnv *, jobject, jint itr){
+JNIEXPORT jlong JNICALL Java_NativeInterface_db_1previous_1i64
+  (JNIEnv *, jclass, jint itr){
    uint64_t primary = 0;
    return db_previous_i64(itr, &primary);
 }
@@ -196,8 +203,8 @@ JNIEXPORT jlong JNICALL Java_VMMain_db_1previous_1i64
  * Method:    db_find_i64
  * Signature: (JJJJ)I
  */
-JNIEXPORT jint JNICALL Java_VMMain_db_1find_1i64
-  (JNIEnv *, jobject, jlong code, jlong scope, jlong table_id, jlong id){
+JNIEXPORT jint JNICALL Java_NativeInterface_db_1find_1i64
+  (JNIEnv *, jclass, jlong code, jlong scope, jlong table_id, jlong id){
    return db_find_i64(code, scope, table_id, id);
 }
 
@@ -206,8 +213,8 @@ JNIEXPORT jint JNICALL Java_VMMain_db_1find_1i64
  * Method:    db_lowerbound_i64
  * Signature: (JJJJ)I
  */
-JNIEXPORT jint JNICALL Java_VMMain_db_1lowerbound_1i64
-  (JNIEnv *, jobject, jlong code, jlong scope, jlong table_id, jlong id){
+JNIEXPORT jint JNICALL Java_NativeInterface_db_1lowerbound_1i64
+  (JNIEnv *, jclass, jlong code, jlong scope, jlong table_id, jlong id){
    return db_lowerbound_i64(code, scope, table_id, id);
 }
 
@@ -216,8 +223,8 @@ JNIEXPORT jint JNICALL Java_VMMain_db_1lowerbound_1i64
  * Method:    db_upperbound_i64
  * Signature: (JJJJ)I
  */
-JNIEXPORT jint JNICALL Java_VMMain_db_1upperbound_1i64
-  (JNIEnv *, jobject, jlong code, jlong scope, jlong table_id, jlong id){
+JNIEXPORT jint JNICALL Java_NativeInterface_db_1upperbound_1i64
+  (JNIEnv *, jclass, jlong code, jlong scope, jlong table_id, jlong id){
    return db_upperbound_i64(code, scope, table_id, id);
 }
 
@@ -226,7 +233,7 @@ JNIEXPORT jint JNICALL Java_VMMain_db_1upperbound_1i64
  * Method:    db_end_i64
  * Signature: ()I
  */
-JNIEXPORT jint JNICALL Java_VMMain_db_1end_1i64
-  (JNIEnv *, jobject, jlong code, jlong scope, jlong table_id){
+JNIEXPORT jint JNICALL Java_NativeInterface_db_1end_1i64
+  (JNIEnv *, jclass, jlong code, jlong scope, jlong table_id){
    return db_end_i64(code, scope, table_id);
 }