X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=typescript_strings.py;h=a3c706ecafc98bf22eb893c41eeb8cf53fcd69db;hb=refs%2Fheads%2F2021-03-license;hp=5e008a736ce5da66d1119602c8bc6264840db1d4;hpb=de03148c22457c5cfd95a64c6ca24ef4aab763d6;p=ldk-java diff --git a/typescript_strings.py b/typescript_strings.py index 5e008a73..a3c706ec 100644 --- a/typescript_strings.py +++ b/typescript_strings.py @@ -82,6 +82,9 @@ public static native long new_empty_slice_vec(); } """ + self.util_fn_pfx = "" + self.util_fn_sfx = "" + self.common_base = """ export default class CommonBase { ptr: number; @@ -105,7 +108,9 @@ void *memcpy(void *dest, const void *src, size_t n); int memcmp(const void *s1, const void *s2, size_t n); void __attribute__((noreturn)) abort(void); -void assert(bool expression); +static inline void assert(bool expression) { + if (!expression) { abort(); } +} """ if not DEBUG: @@ -216,16 +221,33 @@ _Static_assert(offsetof(LDKCVec_u8Z, datalen) == offsetof(LDKu8slice, datalen), _Static_assert(sizeof(void*) == 4, "Pointers mut be 32 bits"); -typedef struct int64_tArray { uint32_t *len; /* len + 1 is data */ } int64_tArray; -typedef struct uint32_tArray { uint32_t *len; /* len + 1 is data */ } uint32_tArray; -typedef struct ptrArray { uint32_t *len; /* len + 1 is data */ } ptrArray; -typedef struct int8_tArray { uint32_t *len; /* len + 1 is data */ } int8_tArray; -typedef struct jstring {} jstring; +typedef uint32_t int64_tArray; +typedef uint32_t int8_tArray; +typedef uint32_t uint32_tArray; +typedef uint32_t ptrArray; +typedef uint32_t jstring; -jstring conv_owned_string(const char* _src) { jstring a; return a; } +static inline uint32_t init_arr(size_t arr_len, size_t elem_size, const char *type_desc) { + uint32_t *elems = (uint32_t*)MALLOC(arr_len * elem_size + 4, type_desc); + elems[0] = arr_len; + return (uint32_t)elems; +} + +jstring str_ref_to_ts(const char* chars, size_t len) { + char* err_buf = MALLOC(len + 4, "str conv buf"); + *((uint32_t*)err_buf) = len; + memcpy(err_buf + 4, chars, len); + return (uint32_t) err_buf; +} typedef bool jboolean; +uint32_t __attribute__((visibility("default"))) TS_malloc(uint32_t size) { + return (uint32_t)MALLOC(size, "JS-Called malloc"); +} +void __attribute__((visibility("default"))) TS_free(uint32_t ptr) { + FREE((void*)ptr); +} """ self.hu_struct_file_prefix = f""" @@ -234,50 +256,47 @@ import * as bindings from '../bindings' // TODO: figure out location """ self.c_fn_ty_pfx = "" - self.c_fn_name_pfx = "" - self.c_fn_args_pfx = "void* ctx_TODO" self.file_ext = ".ts" self.ptr_c_ty = "uint32_t" - self.ptr_native_ty = "uint32_t" + self.ptr_native_ty = "number" self.result_c_ty = "uint32_t" - self.owned_str_to_c_call = ("conv_owned_string(", ")") self.ptr_arr = "ptrArray" - self.get_native_arr_len_call = ("*", ".len") + self.get_native_arr_len_call = ("*((uint32_t*)", ")") def release_native_arr_ptr_call(self, ty_info, arr_var, arr_ptr_var): return None def create_native_arr_call(self, arr_len, ty_info): if ty_info.c_ty == "int8_tArray": - return "{ .len = MALLOC(" + arr_len + " + sizeof(uint32_t), \"Native " + ty_info.c_ty + " Bytes\") }" + return "init_arr(" + arr_len + ", sizeof(uint8_t), \"Native int8_tArray Bytes\")" elif ty_info.c_ty == "int64_tArray": - return "{ .len = MALLOC(" + arr_len + " * sizeof(int64_t) + sizeof(uint32_t), \"Native " + ty_info.c_ty + " Bytes\") }" + return "init_arr(" + arr_len + ", sizeof(uint64_t), \"Native int64_tArray Bytes\")" elif ty_info.c_ty == "uint32_tArray": - return "{ .len = MALLOC(" + arr_len + " * sizeof(int32_t) + sizeof(uint32_t), \"Native " + ty_info.c_ty + " Bytes\") }" + return "init_arr(" + arr_len + ", sizeof(uint32_t), \"Native uint32_tArray Bytes\")" elif ty_info.c_ty == "ptrArray": assert ty_info.subty is not None and ty_info.subty.c_ty.endswith("Array") - return "{ .len = MALLOC(" + arr_len + " * sizeof(int32_t) + sizeof(uint32_t), \"Native Object Bytes\") }" + return "init_arr(" + arr_len + ", sizeof(uint32_t), \"Native ptrArray Bytes\")" else: print("Need to create arr!", ty_info.c_ty) return ty_info.c_ty def set_native_arr_contents(self, arr_name, arr_len, ty_info): if ty_info.c_ty == "int8_tArray": - return ("memcpy(" + arr_name + ".len + 1, ", ", " + arr_len + ")") + return ("memcpy((uint8_t*)(" + arr_name + " + 4), ", ", " + arr_len + ")") else: assert False def get_native_arr_contents(self, arr_name, dest_name, arr_len, ty_info, copy): if ty_info.c_ty == "int8_tArray": if copy: - return "memcpy(" + dest_name + ", " + arr_name + ".len + 1, " + arr_len + ")" + return "memcpy(" + dest_name + ", (uint8_t*)(" + arr_name + " + 4), " + arr_len + ")" else: - return "(int8_t*)(" + arr_name + ".len + 1)" + return "(int8_t*)(" + arr_name + " + 4)" else: - return "(" + ty_info.subty.c_ty + "*)(" + arr_name + ".len + 1)" + return "(" + ty_info.subty.c_ty + "*)(" + arr_name + " + 4)" def get_native_arr_elem(self, arr_name, idxc, ty_info): assert False # Only called if above is None def get_native_arr_ptr_call(self, ty_info): if ty_info.subty is not None: - return "(" + ty_info.subty.c_ty + "*)(", ".len + 1)" - return "(" + ty_info.c_ty + "*)(", ".len + 1)" + return "(" + ty_info.subty.c_ty + "*)(", " + 4)" + return "(" + ty_info.c_ty + "*)(", " + 4)" def get_native_arr_entry_call(self, ty_info, arr_name, idxc, entry_access): return None def cleanup_native_arr_ref_contents(self, arr_name, dest_name, arr_len, ty_info): @@ -286,6 +305,12 @@ import * as bindings from '../bindings' // TODO: figure out location else: return None + def str_ref_to_c_call(self, var_name, str_len): + return "str_ref_to_ts(" + var_name + ", " + str_len + ")" + + def c_fn_name_define_pfx(self, fn_name, have_args): + return " __attribute__((visibility(\"default\"))) TS_" + fn_name + "(" + def wasm_import_header(self, target): if target == Target.NODEJS: return """ @@ -317,9 +342,18 @@ const nextMultipleOfFour = (value: number) => { return Math.ceil(value / 4) * 4; } -const encodeArray = (inputArray) => { - const cArrayPointer = wasm.wasm_malloc((inputArray.length + 1) * 4); - const arrayMemoryView = new Uint32Array(memory.buffer, cArrayPointer + 4, inputArray.length); +const encodeUint8Array = (inputArray) => { + const cArrayPointer = wasm.TS_malloc(inputArray.length + 4); + const arrayLengthView = new Uint32Array(memory.buffer, cArrayPointer, 1); + arrayLengthView[0] = inputArray.length; + const arrayMemoryView = new Uint8Array(memory.buffer, cArrayPointer + 4, inputArray.length); + arrayMemoryView.set(inputArray); + return cArrayPointer; +} + +const encodeUint32Array = (inputArray) => { + const cArrayPointer = wasm.TS_malloc((inputArray.length + 1) * 4); + const arrayMemoryView = new Uint32Array(memory.buffer, cArrayPointer, inputArray.length); arrayMemoryView.set(inputArray, 1); arrayMemoryView[0] = inputArray.length; return cArrayPointer; @@ -344,7 +378,7 @@ const decodeUint8Array = (arrayPointer, free = true) => { // will free the underlying memory when it becomes unreachable instead of copying here. const actualArray = actualArrayViewer.slice(0, arraySize); if (free) { - wasm.free(arrayPointer); + wasm.TS_free(arrayPointer); } return actualArray; } @@ -359,7 +393,7 @@ const decodeUint32Array = (arrayPointer, free = true) => { // will free the underlying memory when it becomes unreachable instead of copying here. const actualArray = actualArrayViewer.slice(0, arraySize); if (free) { - wasm.free(arrayPointer); + wasm.TS_free(arrayPointer); } return actualArray; } @@ -367,7 +401,7 @@ const decodeUint32Array = (arrayPointer, free = true) => { const encodeString = (string) => { // make malloc count divisible by 4 const memoryNeed = nextMultipleOfFour(string.length + 1); - const stringPointer = wasm.wasm_malloc(memoryNeed); + const stringPointer = wasm.TS_malloc(memoryNeed); const stringMemoryView = new Uint8Array( memory.buffer, // value stringPointer, // offset @@ -402,7 +436,7 @@ const decodeString = (stringPointer, free = true) => { def init_str(self): return "" - def native_c_unitary_enum_map(self, struct_name, variants): + def native_c_unitary_enum_map(self, struct_name, variants, enum_doc_comment): out_c = "static inline " + struct_name + " " + struct_name + "_from_js(int32_t ord) {\n" out_c = out_c + "\tswitch (ord) {\n" ord_v = 0 @@ -449,7 +483,7 @@ const decodeString = (stringPointer, free = true) => { ret = ret + "; (void) " + param return ret - def native_c_map_trait(self, struct_name, field_var_conversions, field_function_lines): + def native_c_map_trait(self, struct_name, field_var_conversions, field_function_lines, trait_doc_comment): out_typescript_bindings = "\n\n\n// OUT_TYPESCRIPT_BINDINGS :: MAP_TRAIT :: START\n\n" constructor_arguments = "" @@ -613,7 +647,6 @@ const decodeString = (stringPointer, free = true) => { # Now that we've written out our java code (and created java_meths), generate C out_c = "typedef struct " + struct_name + "_JCalls {\n" out_c = out_c + "\tatomic_size_t refcnt;\n" - out_c = out_c + "\t// TODO: Object pointer o;\n" for var in field_var_conversions: if isinstance(var, ConvInfo): # We're a regular ol' field @@ -623,7 +656,7 @@ const decodeString = (stringPointer, free = true) => { out_c = out_c + "\t" + var[0] + "_JCalls* " + var[1] + ";\n" for fn in field_function_lines: if fn.fn_name != "free" and fn.fn_name != "clone": - out_c = out_c + "\t// TODO: Some kind of method pointer " + fn.fn_name + "_meth;\n" + out_c = out_c + "\tuint32_t " + fn.fn_name + "_meth;\n" out_c = out_c + "} " + struct_name + "_JCalls;\n" for fn_line in field_function_lines: @@ -631,7 +664,9 @@ const decodeString = (stringPointer, free = true) => { out_c = out_c + "static void " + struct_name + "_JCalls_free(void* this_arg) {\n" out_c = out_c + "\t" + struct_name + "_JCalls *j_calls = (" + struct_name + "_JCalls*) this_arg;\n" out_c = out_c + "\tif (atomic_fetch_sub_explicit(&j_calls->refcnt, 1, memory_order_acquire) == 1) {\n" - out_c = out_c + "\t\t// TODO: do any release required for j_calls->o (refcnt-- in java, but may be redundant)\n" + for fn in field_function_lines: + if fn.fn_name != "free" and fn.fn_name != "clone": + out_c = out_c + "\t\tjs_free(j_calls->" + fn.fn_name + "_meth);\n" out_c = out_c + "\t\tFREE(j_calls);\n" out_c = out_c + "\t}\n}\n" @@ -656,15 +691,14 @@ const decodeString = (stringPointer, free = true) => { out_c = out_c + arg_info.arg_name out_c = out_c + arg_info.ret_conv[1].replace('\n', '\n\t') + "\n" - out_c = out_c + "\t//TODO: jobject obj = get object we can call against on j_calls->o\n" if fn_line.ret_ty_info.c_ty.endswith("Array"): - out_c = out_c + "\t" + fn_line.ret_ty_info.c_ty + " arg; // TODO: Call " + fn_line.fn_name + " on j_calls with instance obj, returning an object" + out_c = out_c + "\t" + fn_line.ret_ty_info.c_ty + " ret = js_invoke_function_" + str(len(fn_line.args_ty)) + "(j_calls->" + fn_line.fn_name + "_meth" elif fn_line.ret_ty_info.java_ty == "void": - out_c = out_c + "\treturn; //TODO: Call " + fn_line.fn_name + " on j_calls with instance obj" + out_c = out_c + "\tjs_invoke_function_" + str(len(fn_line.args_ty)) + "(j_calls->" + fn_line.fn_name + "_meth" elif not fn_line.ret_ty_info.passed_as_ptr: - out_c = out_c + "\treturn 0; //TODO: Call " + fn_line.fn_name + " on j_calls with instance obj, returning " + fn_line.ret_ty_info.java_ty + out_c = out_c + "\treturn js_invoke_function_" + str(len(fn_line.args_ty)) + "(j_calls->" + fn_line.fn_name + "_meth" else: - out_c = out_c + "\t" + fn_line.ret_ty_info.rust_obj + "* ret; // TODO: Call " + fn_line.fn_name + " on j_calls with instance obj, returning a pointer" + out_c = out_c + "\t" + fn_line.ret_ty_info.rust_obj + "* ret = (" + fn_line.ret_ty_info.rust_obj + "*)js_invoke_function_" + str(len(fn_line.args_ty)) + "(j_calls->" + fn_line.fn_name + "_meth" for idx, arg_info in enumerate(fn_line.args_ty): if arg_info.ret_conv is not None: @@ -687,7 +721,7 @@ const decodeString = (stringPointer, free = true) => { out_c = out_c + "\treturn (void*) this_arg;\n" out_c = out_c + "}\n" - out_c = out_c + "static inline " + struct_name + " " + struct_name + "_init (" + self.c_fn_args_pfx + ", /*TODO: JS Object Reference */void* o" + out_c = out_c + "static inline " + struct_name + " " + struct_name + "_init (/*TODO: JS Object Reference */void* o" for var in field_var_conversions: if isinstance(var, ConvInfo): out_c = out_c + ", " + var.c_ty + " " + var.arg_name @@ -725,7 +759,7 @@ const decodeString = (stringPointer, free = true) => { out_c = out_c + "\t\t." + var.var_name + " = " + var.var_name + ",\n" out_c = out_c + "\t\t.set_" + var.var_name + " = NULL,\n" else: - out_c = out_c + "\t\t." + var[1] + " = " + var[0] + "_init(NULL, " + var[1] + "),\n" + out_c = out_c + "\t\t." + var[1] + " = " + var[0] + "_init(" + var[1] + "),\n" out_c = out_c + "\t};\n" for var in field_var_conversions: if not isinstance(var, ConvInfo): @@ -733,7 +767,7 @@ const decodeString = (stringPointer, free = true) => { out_c = out_c + "\treturn ret;\n" out_c = out_c + "}\n" - out_c = out_c + self.c_fn_ty_pfx + "long " + self.c_fn_name_pfx + struct_name.replace("_", "_1") + "_1new (" + self.c_fn_args_pfx + ", /*TODO: JS Object Reference */void* o" + out_c = out_c + self.c_fn_ty_pfx + "long " + self.c_fn_name_define_pfx(struct_name + "_new", True) + "/*TODO: JS Object Reference */void* o" for var in field_var_conversions: if isinstance(var, ConvInfo): out_c = out_c + ", " + var.c_ty + " " + var.arg_name @@ -741,7 +775,7 @@ const decodeString = (stringPointer, free = true) => { out_c = out_c + ", /*TODO: JS Object Reference */ void* " + var[1] out_c = out_c + ") {\n" out_c = out_c + "\t" + struct_name + " *res_ptr = MALLOC(sizeof(" + struct_name + "), \"" + struct_name + "\");\n" - out_c = out_c + "\t*res_ptr = " + struct_name + "_init(NULL, o" + out_c = out_c + "\t*res_ptr = " + struct_name + "_init(o" for var in field_var_conversions: if isinstance(var, ConvInfo): out_c = out_c + ", " + var.arg_name @@ -756,7 +790,7 @@ const decodeString = (stringPointer, free = true) => { def trait_struct_inc_refcnt(self, ty_info): return "" - def map_complex_enum(self, struct_name, variant_list, camel_to_snake): + def map_complex_enum(self, struct_name, variant_list, camel_to_snake, enum_doc_comment): java_hu_type = struct_name.replace("LDK", "") out_java_enum = "" @@ -811,7 +845,7 @@ const decodeString = (stringPointer, free = true) => { out_java += ("\tstatic { " + struct_name + ".init(); }\n") out_java += ("\tpublic static native " + struct_name + " " + struct_name + "_ref_from_ptr(long ptr);\n"); - out_c += (self.c_fn_ty_pfx + self.c_complex_enum_pass_ty(struct_name) + " " + self.c_fn_name_pfx + struct_name.replace("_", "_1") + "_1ref_1from_1ptr (" + self.c_fn_args_pfx + ", " + self.ptr_c_ty + " ptr) {\n") + out_c += (self.c_fn_ty_pfx + self.c_complex_enum_pass_ty(struct_name) + self.c_fn_name_define_pfx(struct_name + "_ref_from_ptr", True) + self.ptr_c_ty + " ptr) {\n") out_c += ("\t" + struct_name + " *obj = (" + struct_name + "*)ptr;\n") out_c += ("\tswitch(obj->tag) {\n") for var in variant_list: @@ -833,7 +867,7 @@ const decodeString = (stringPointer, free = true) => { out_java_enum += (java_hu_subclasses) return (out_java, out_java_enum, out_c) - def map_opaque_struct(self, struct_name): + def map_opaque_struct(self, struct_name, struct_doc_comment): implementations = "" method_header = "" if struct_name.startswith("LDKLocked"): @@ -863,7 +897,7 @@ const decodeString = (stringPointer, free = true) => { """ return out_opaque_struct_human - def map_function(self, argument_types, c_call_string, is_free, method_name, return_type_info, struct_meth, default_constructor_args, takes_self, args_known, has_out_java_struct: bool, type_mapping_generator): + def map_function(self, argument_types, c_call_string, method_name, return_type_info, struct_meth, default_constructor_args, takes_self, args_known, type_mapping_generator, doc_comment): out_java = "" out_c = "" out_java_struct = None @@ -875,7 +909,7 @@ const decodeString = (stringPointer, free = true) => { if return_type_info.ret_conv is not None: ret_conv_pfx, ret_conv_sfx = return_type_info.ret_conv out_java += (" " + method_name + "(") - out_c += (" " + self.c_fn_name_pfx + method_name.replace('_', '_1') + "(" + self.c_fn_args_pfx) + out_c += (" " + self.c_fn_name_define_pfx(method_name, True)) method_argument_string = "" native_call_argument_string = "" @@ -883,7 +917,6 @@ const decodeString = (stringPointer, free = true) => { if idx != 0: method_argument_string += (", ") native_call_argument_string += ', ' - if arg_conv_info.c_ty != "void": out_c += (", ") if arg_conv_info.c_ty != "void": out_c += (arg_conv_info.c_ty + " " + arg_conv_info.arg_name) @@ -905,42 +938,39 @@ const decodeString = (stringPointer, free = true) => { return_statement = f"return {converter}(nativeResponseValue);" out_java = f"""\texport function {method_name}({method_argument_string}): {return_type_info.java_ty} {{ - if(!isWasmInitialized){{ - throw new Error("initializeWasm() must be awaited first!"); - }} - const nativeResponseValue = wasm.{method_name}({native_call_argument_string}); - {return_statement}\n\t}} - \n""" - - + if(!isWasmInitialized) {{ + throw new Error("initializeWasm() must be awaited first!"); + }} + const nativeResponseValue = wasm.{method_name}({native_call_argument_string}); + {return_statement} + }} +""" - if has_out_java_struct: - out_java_struct = "" - if not args_known: - out_java_struct += ("\t// Skipped " + method_name + "\n") - has_out_java_struct = False + out_java_struct = "" + if not args_known: + out_java_struct += ("\t// Skipped " + method_name + "\n") + else: + meth_n = method_name[len(struct_meth) + 1:] + if not takes_self: + out_java_struct += ( + "\tpublic static " + return_type_info.java_hu_ty + " constructor_" + meth_n + "(") else: - meth_n = method_name[len(struct_meth) + 1:] - if not takes_self: - out_java_struct += ( - "\tpublic static " + return_type_info.java_hu_ty + " constructor_" + meth_n + "(") - else: - out_java_struct += ("\tpublic " + return_type_info.java_hu_ty + " " + meth_n + "(") - for idx, arg in enumerate(argument_types): - if idx != 0: - if not takes_self or idx > 1: - out_java_struct += (", ") - elif takes_self: - continue - if arg.java_ty != "void": - if arg.arg_name in default_constructor_args: - for explode_idx, explode_arg in enumerate(default_constructor_args[arg.arg_name]): - if explode_idx != 0: - out_java_struct += (", ") - out_java_struct += ( - explode_arg.java_hu_ty + " " + arg.arg_name + "_" + explode_arg.arg_name) - else: - out_java_struct += (arg.java_hu_ty + " " + arg.arg_name) + out_java_struct += ("\tpublic " + return_type_info.java_hu_ty + " " + meth_n + "(") + for idx, arg in enumerate(argument_types): + if idx != 0: + if not takes_self or idx > 1: + out_java_struct += (", ") + elif takes_self: + continue + if arg.java_ty != "void": + if arg.arg_name in default_constructor_args: + for explode_idx, explode_arg in enumerate(default_constructor_args[arg.arg_name]): + if explode_idx != 0: + out_java_struct += (", ") + out_java_struct += ( + explode_arg.java_hu_ty + " " + arg.arg_name + "_" + explode_arg.arg_name) + else: + out_java_struct += (arg.java_hu_ty + " " + arg.arg_name) out_c += (") {\n") if out_java_struct is not None: @@ -979,7 +1009,7 @@ const decodeString = (stringPointer, free = true) => { out_c += ("\n\treturn ret_val;") out_c += ("\n}\n\n") - if has_out_java_struct: + if args_known: out_java_struct += ("\t\t") if return_type_info.java_ty != "void": out_java_struct += (return_type_info.java_ty + " ret = ") @@ -1026,9 +1056,9 @@ const decodeString = (stringPointer, free = true) => { elif info.from_hu_conv is not None and info.from_hu_conv[1] != "": if not takes_self and return_type_info.to_hu_conv_name is not None: out_java_struct += ( - "\t\t" + info.from_hu_conv[1].replace("this", return_type_info.to_hu_conv_name) + ";\n") + "\t\t" + info.from_hu_conv[1].replace("this", return_type_info.to_hu_conv_name).replace("\n", "\n\t\t") + ";\n") else: - out_java_struct += ("\t\t" + info.from_hu_conv[1] + ";\n") + out_java_struct += ("\t\t" + info.from_hu_conv[1].replace("\n", "\n\t\t") + ";\n") if return_type_info.to_hu_conv_name is not None: out_java_struct += ("\t\treturn " + return_type_info.to_hu_conv_name + ";\n")