uint8_t = ['number', 'Uint8Array'],
uint16_t = ['number', 'Uint16Array'],
uint32_t = ['number', 'Uint32Array'],
- long = ['number'],
+ uint64_t = ['number'],
)
self.wasm_decoding_map = dict(
public datalen: number;
public stride: number;
public constructor(dataptr: number, datalen: number, stride: number) {
- this.dataptr = dataptr;
- this.datalen = datalen;
+ this.dataptr = dataptr;
+ this.datalen = datalen;
this.stride = stride;
}
}
// TODO: finalize myself
}
}
- """
+"""
self.c_file_pfx = """#include <rust_types.h>
+#include "js-wasm.h"
#include <stdatomic.h>
#include <lightning.h>
int memcmp(const void *s1, const void *s2, size_t n);
void __attribute__((noreturn)) abort(void);
-void assert(scalar expression);
+static inline void assert(bool expression) {
+ if (!expression) { abort(); }
+}
"""
if not DEBUG:
_Static_assert(sizeof(void*) == 4, "Pointers mut be 32 bits");
-typedef struct int64_tArray {uint32_t len;int64_t *ptr;} int64_tArray;
-typedef struct uint32_tArray {uint32_t len;int32_t *ptr;} uint32_tArray;
-typedef struct int8_tArray {uint32_t len;int8_t *ptr;} int8_tArray;
+//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 uint32_t int64_tArray;
+typedef uint32_t int8_tArray;
+typedef uint32_t uint32_tArray;
+typedef uint32_t ptrArray;
+typedef uint32_t jstring;
+
+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;
"""
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 = "number" # "uint32_t"
+ self.ptr_native_ty = "number"
self.result_c_ty = "uint32_t"
- self.ptr_arr = "uint32_tArray"
- self.get_native_arr_len_call = ("", ".len")
- self.get_native_arr_ptr_call = ("", ".ptr")
+ self.ptr_arr = "ptrArray"
+ self.get_native_arr_len_call = ("*((uint32_t*)", ")")
- def release_native_arr_ptr_call(self, arr_var, arr_ptr_var):
+ 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 = " + arr_len + ", .ptr = MALLOC(" + arr_len + ", \"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 = " + arr_len + ", .ptr = MALLOC(" + arr_len + " * sizeof(int64_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 = " + arr_len + ", .ptr = MALLOC(" + arr_len + " * sizeof(int32_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 "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 + ".ptr, ", ", " + 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 + ".ptr, " + arr_len + ")"
+ return "memcpy(" + dest_name + ", (uint8_t*)(" + arr_name + " + 4), " + arr_len + ")"
else:
- return arr_name + ".ptr"
+ return "(int8_t*)(" + arr_name + " + 4)"
else:
- return "(" + ty_info.subty.c_ty + "*) " + arr_name + ".ptr"
+ 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 + "*)(", " + 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):
if ty_info.c_ty == "int8_tArray":
return None
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 """
-
import * as fs from 'fs';
const source = fs.readFileSync('./ldk.wasm');
}
const encodeArray = (inputArray) => {
- // TODO: (matt) is this correct, or should it go back to length * 4?
- // const cArrayPointer = wasm.wasm_malloc(inputArray.length * 4);
- const cArrayPointer = wasm.wasm_malloc(nextMultipleOfFour(inputArray.length));
-
- const arrayMemoryView = new Uint32Array(memory.buffer, cArrayPointer, inputArray.length);
- arrayMemoryView.set(inputArray);
- return cArrayPointer;
+ const cArrayPointer = wasm.wasm_malloc((inputArray.length + 1) * 4);
+ const arrayMemoryView = new Uint32Array(memory.buffer, cArrayPointer + 4, inputArray.length);
+ arrayMemoryView.set(inputArray, 1);
+ arrayMemoryView[0] = inputArray.length;
+ return cArrayPointer;
}
-const decodeArray = (arrayPointer, free = true) => {
- const arraySizeViewer = new Uint32Array(
- memory.buffer, // value
- arrayPointer, // offset
- 1 // one int
- );
- const arraySize = arraySizeViewer[0];
- const actualArrayViewer = new Uint32Array(
- memory.buffer, // value
- arrayPointer, // offset
- arraySize + 1
- );
- const actualArray = actualArrayViewer.slice(1, arraySize + 1);
- if (free) {
- // wasm.free_array(arrayPointer);
- wasm.wasm_free(arrayPointer); // TODO: check if passing *void still captures remaining values
- }
- return actualArray;
+const getArrayLength = (arrayPointer) => {
+ const arraySizeViewer = new Uint32Array(
+ memory.buffer, // value
+ arrayPointer, // offset
+ 1 // one int
+ );
+ return arraySizeViewer[0];
+}
+const decodeUint8Array = (arrayPointer, free = true) => {
+ const arraySize = getArrayLength(arrayPointer);
+ const actualArrayViewer = new Uint8Array(
+ memory.buffer, // value
+ arrayPointer + 4, // offset (ignoring length bytes)
+ arraySize // uint8 count
+ );
+ // Clone the contents, TODO: In the future we should wrap the Viewer in a class that
+ // will free the underlying memory when it becomes unreachable instead of copying here.
+ const actualArray = actualArrayViewer.slice(0, arraySize);
+ if (free) {
+ wasm.free(arrayPointer);
+ }
+ return actualArray;
+}
+const decodeUint32Array = (arrayPointer, free = true) => {
+ const arraySize = getArrayLength(arrayPointer);
+ const actualArrayViewer = new Uint32Array(
+ memory.buffer, // value
+ arrayPointer + 4, // offset (ignoring length bytes)
+ arraySize // uint32 count
+ );
+ // Clone the contents, TODO: In the future we should wrap the Viewer in a class that
+ // will free the underlying memory when it becomes unreachable instead of copying here.
+ const actualArray = actualArrayViewer.slice(0, arraySize);
+ if (free) {
+ wasm.free(arrayPointer);
+ }
+ return actualArray;
}
const encodeString = (string) => {
return result;
};
-
-
- """
+"""
return ''
- def init_str(self, c_array_class_caches):
+ def init_str(self):
return ""
def native_c_unitary_enum_map(self, struct_name, variants):
export enum {struct_name} {{
{out_typescript_enum_fields}
}}
- """
+"""
return (out_c, out_typescript_enum, "")
else:
trait_constructor_arguments += ", " + var[1] + ".new_impl(" + var[1] + "_impl).bindings_instance"
-
-
out_typescript_human = f"""
{self.hu_struct_file_prefix}
-
+
export class {struct_name.replace("LDK","")} extends CommonBase {{
-
+
bindings_instance?: bindings.{struct_name};
-
+
constructor(ptr?: number, arg?: bindings.{struct_name}{constructor_arguments}) {{
if (Number.isFinite(ptr)) {{
super(ptr);
{pointer_to_adder}
}}
}}
-
+
protected finalize() {{
- if (this.ptr != 0) {{
- bindings.{struct_name.replace("LDK","")}_free(this.ptr);
- }}
+ if (this.ptr != 0) {{
+ bindings.{struct_name.replace("LDK","")}_free(this.ptr);
+ }}
super.finalize();
}}
-
+
static new_impl(arg: {struct_name.replace("LDK", "")}Interface{impl_constructor_arguments}): {struct_name.replace("LDK", "")} {{
const impl_holder: {struct_name}Holder = new {struct_name}Holder();
let structImplementation = <bindings.{struct_name}>{{
-
// todo: in-line interface filling
-
{out_interface_implementation_overrides}
}};
impl_holder.held = new {struct_name.replace("LDK", "")} (null, structImplementation{trait_constructor_arguments});
}}
-
}}
-
+
export interface {struct_name.replace("LDK", "")}Interface {{
{out_java_interface}
}}
-
+
class {struct_name}Holder {{
held: {struct_name.replace("LDK", "")};
}}
-
- """
-
-
+"""
out_typescript_bindings += "\t\texport interface " + struct_name + " {\n"
java_meths = []
out_typescript_bindings += f"""): number {{
throw new Error('unimplemented'); // TODO: bind to WASM
}}
-
- export function {struct_name}_get_obj_from_jcalls(val: number): {struct_name} {{
- throw new Error('unimplemented'); // TODO: bind to WASM
- }}
- """
+"""
out_typescript_bindings += '\n// OUT_TYPESCRIPT_BINDINGS :: MAP_TRAIT :: END\n\n\n'
# 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 + "\tJavaVM *vm;\n"
- out_c = out_c + "\tjweak o;\n"
for var in field_var_conversions:
if isinstance(var, ConvInfo):
# We're a regular ol' field
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 + "\tjmethodID " + 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:
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\tJNIEnv *env;\n"
- out_c = out_c + "\t\tDO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK);\n"
- out_c = out_c + "\t\t(*env)->DeleteWeakGlobalRef(env, j_calls->o);\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"
out_c = out_c + ") {\n"
out_c = out_c + "\t" + struct_name + "_JCalls *j_calls = (" + struct_name + "_JCalls*) this_arg;\n"
- out_c = out_c + "\tJNIEnv *env;\n"
- out_c = out_c + "\tDO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK);\n"
for arg_info in fn_line.args_ty:
if arg_info.ret_conv is not None:
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 + "\tjobject obj = (*env)->NewLocalRef(env, j_calls->o);\n\tCHECK(obj != NULL);\n"
if fn_line.ret_ty_info.c_ty.endswith("Array"):
- out_c = out_c + "\t" + fn_line.ret_ty_info.c_ty + " arg = (*env)->CallObjectMethod(env, obj, j_calls->" + fn_line.fn_name + "_meth"
+ out_c = out_c + "\t" + fn_line.ret_ty_info.c_ty + " arg = 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 + "\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 (*env)->Call" + fn_line.ret_ty_info.java_ty.title() + "Method(env, obj, j_calls->" + fn_line.fn_name + "_meth"
+ 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 = (" + fn_line.ret_ty_info.rust_obj + "*)(*env)->CallLongMethod(env, obj, j_calls->" + fn_line.fn_name + "_meth"
+ 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:
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 + ", jobject 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
else:
- out_c = out_c + ", jobject " + var[1]
+ out_c = out_c + ", /*TODO: JS Object Reference */void* " + var[1]
out_c = out_c + ") {\n"
- out_c = out_c + "\tjclass c = (*env)->GetObjectClass(env, o);\n"
- out_c = out_c + "\tCHECK(c != NULL);\n"
out_c = out_c + "\t" + struct_name + "_JCalls *calls = MALLOC(sizeof(" + struct_name + "_JCalls), \"" + struct_name + "_JCalls\");\n"
out_c = out_c + "\tatomic_init(&calls->refcnt, 1);\n"
- out_c = out_c + "\tDO_ASSERT((*env)->GetJavaVM(env, &calls->vm) == 0);\n"
- out_c = out_c + "\tcalls->o = (*env)->NewWeakGlobalRef(env, o);\n"
+ out_c = out_c + "\t//TODO: Assign calls->o from o\n"
for (fn_name, java_meth_descr) in java_meths:
if fn_name != "free" and fn_name != "clone":
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(env, clz, " + 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):
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 + ", jobject 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
else:
- out_c = out_c + ", jobject " + var[1]
+ 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(env, clz, 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
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_typescript_bindings, out_typescript_human, out_c)
+ def trait_struct_inc_refcnt(self, ty_info):
+ return ""
+
def map_complex_enum(self, struct_name, variant_list, camel_to_snake):
java_hu_type = struct_name.replace("LDK", "")
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:
return (out_java, out_java_enum, out_c)
def map_opaque_struct(self, struct_name):
-
implementations = ""
method_header = ""
if struct_name.startswith("LDKLocked"):
implementations += "implements AutoCloseable "
method_header = """
public close() {
- """
+"""
else:
method_header = """
protected finalize() {
super.finalize();
- """
+"""
out_opaque_struct_human = f"""
{self.hu_struct_file_prefix}
-
+
export default class {struct_name.replace("LDK","")} extends CommonBase {implementations}{{
constructor(_dummy: object, ptr: number) {{
super(ptr);
}}
-
+
{method_header}
if (this.ptr != 0) {{
bindings.{struct_name.replace("LDK","")}_free(this.ptr);
}}
}}
- """
+"""
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):
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 = ""
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)
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 = ""
projects / ldk-java / blobdiff