X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=java_strings.py;h=086518ff6b2a05ed59a9baefbbe936d452a5ae1f;hb=adb79d6aab43c765dfab7031d09f3fb583b7260c;hp=020f809372d420dabc4d8377b743cf394085bf64;hpb=e230b76895008cc4f744ea2895ef5c6b847e5039;p=ldk-java diff --git a/java_strings.py b/java_strings.py index 020f8093..086518ff 100644 --- a/java_strings.py +++ b/java_strings.py @@ -2,12 +2,12 @@ from bindingstypes import * class Consts: def __init__(self, DEBUG: bool, **kwargs): - + self.c_array_class_caches = set() self.c_type_map = dict( uint8_t = ['byte'], uint16_t = ['short'], uint32_t = ['int'], - long = ['long'], + uint64_t = ['long'], ) self.to_hu_conv_templates = dict( @@ -67,6 +67,7 @@ class CommonBase { #include #include #include + """ if not DEBUG: @@ -281,6 +282,15 @@ _Static_assert(sizeof(void*) <= 8, "Pointers must fit into 64 bits"); typedef jlongArray int64_tArray; typedef jbyteArray int8_tArray; +static inline jstring str_ref_to_java(JNIEnv *env, const char* chars, size_t len) { + // Sadly we need to create a temporary because Java can't accept a char* without a 0-terminator + char* err_buf = MALLOC(len + 1, "str conv buf"); + memcpy(err_buf, chars, len); + err_buf[len] = 0; + jstring err_conv = (*env)->NewStringUTF(env, chars); + FREE(err_buf); + return err_conv; +} """ self.hu_struct_file_prefix = """package org.ldk.structs; @@ -301,13 +311,18 @@ import java.util.Arrays; self.result_c_ty = "jclass" self.ptr_arr = "jobjectArray" self.get_native_arr_len_call = ("(*env)->GetArrayLength(env, ", ")") - self.get_native_arr_ptr_call = ("(*env)->GetPrimitiveArrayCritical(env, ", ", NULL)") - def release_native_arr_ptr_call(self, arr_var, arr_ptr_var): - return "(*env)->ReleasePrimitiveArrayCritical(env, " + arr_var + ", " + arr_ptr_var + ", 0)" + def release_native_arr_ptr_call(self, ty_info, arr_var, arr_ptr_var): + if ty_info.subty is None or not ty_info.subty.c_ty.endswith("Array"): + return "(*env)->ReleasePrimitiveArrayCritical(env, " + arr_var + ", " + arr_ptr_var + ", 0)" + return None def create_native_arr_call(self, arr_len, ty_info): if ty_info.c_ty == "int8_tArray": return "(*env)->NewByteArray(env, " + arr_len + ")" + elif ty_info.subty.c_ty.endswith("Array"): + clz_var = ty_info.java_fn_ty_arg[1:].replace("[", "arr_of_") + self.c_array_class_caches.add(clz_var) + return "(*env)->NewObjectArray(env, " + arr_len + ", " + clz_var + "_clz, NULL);\n" else: return "(*env)->New" + ty_info.java_ty.strip("[]").title() + "Array(env, " + arr_len + ")" def set_native_arr_contents(self, arr_name, arr_len, ty_info): @@ -330,18 +345,29 @@ import java.util.Arrays; return "(*env)->GetObjectArrayElement(env, " + arr_name + ", " + idxc + ")" else: assert False # Only called if above is None + def get_native_arr_ptr_call(self, ty_info): + if ty_info.subty is not None and ty_info.subty.c_ty.endswith("Array"): + return None + return ("(*env)->GetPrimitiveArrayCritical(env, ", ", NULL)") + def get_native_arr_entry_call(self, ty_info, arr_name, idxc, entry_access): + if ty_info.subty is None or not ty_info.subty.c_ty.endswith("Array"): + return None + return "(*env)->SetObjectArrayElement(env, " + arr_name + ", " + idxc + ", " + entry_access + ")" def cleanup_native_arr_ref_contents(self, arr_name, dest_name, arr_len, ty_info): if ty_info.c_ty == "int8_tArray": return "(*env)->ReleaseByteArrayElements(env, " + arr_name + ", (int8_t*)" + dest_name + ", 0);" else: return "(*env)->Release" + ty_info.java_ty.strip("[]").title() + "ArrayElements(env, " + arr_name + ", " + dest_name + ", 0)" - def init_str(self, c_array_class_caches): + def str_ref_to_c_call(self, var_name, str_len): + return "str_ref_to_java(env, " + var_name + ", " + str_len + ")" + + def init_str(self): res = "" - for ty in c_array_class_caches: + for ty in self.c_array_class_caches: res = res + "static jclass " + ty + "_clz = NULL;\n" res = res + "JNIEXPORT void Java_org_ldk_impl_bindings_init_1class_1cache(JNIEnv * env, jclass clz) {\n" - for ty in c_array_class_caches: + for ty in self.c_array_class_caches: res = res + "\t" + ty + "_clz = (*env)->FindClass(env, \"" + ty.replace("arr_of_", "[") + "\");\n" res = res + "\tCHECK(" + ty + "_clz != NULL);\n" res = res + "\t" + ty + "_clz = (*env)->NewGlobalRef(env, " + ty + "_clz);\n" @@ -547,7 +573,6 @@ import java.util.Arrays; else: out_java = out_java + ", " + var[0] + " " + var[1] out_java = out_java + ");\n" - out_java = out_java + "\tpublic static native " + struct_name + " " + struct_name + "_get_obj_from_jcalls(long val);\n" # Now that we've written out our java code (and created java_meths), generate C out_c = "typedef struct " + struct_name + "_JCalls {\n" @@ -696,14 +721,14 @@ import java.util.Arrays; out_c = out_c + "\treturn (long)res_ptr;\n" out_c = out_c + "}\n" - out_c = out_c + self.c_fn_ty_pfx + "jobject " + self.c_fn_name_pfx + struct_name.replace("_", "_1") + "_1get_1obj_1from_1jcalls (" + self.c_fn_args_pfx + ", " + self.ptr_c_ty + " val) {\n" - out_c = out_c + "\tjobject ret = (*env)->NewLocalRef(env, ((" + struct_name + "_JCalls*)val)->o);\n" - out_c = out_c + "\tCHECK(ret != NULL);\n" - out_c = out_c + "\treturn ret;\n" - out_c = out_c + "}\n" - return (out_java, out_java_trait, out_c) + def trait_struct_inc_refcnt(self, ty_info): + base_conv = "\nif (" + ty_info.var_name + "_conv.free == " + ty_info.rust_obj + "_JCalls_free) {\n" + base_conv = base_conv + "\t// If this_arg is a JCalls struct, then we need to increment the refcnt in it.\n" + base_conv = base_conv + "\t" + ty_info.rust_obj + "_JCalls_clone(" + ty_info.var_name + "_conv.this_arg);\n}" + return base_conv + def map_complex_enum(self, struct_name, variant_list, camel_to_snake): java_hu_type = struct_name.replace("LDK", "") out_java_enum = ""