projects
/
ldk-java
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Typescript C build and string updates
[ldk-java]
/
typescript_strings.py
diff --git
a/typescript_strings.py
b/typescript_strings.py
index cbde654d453ae302847e8018fde36d1dbfebfc88..ad4da8409422f45cc998b287a4efb1a847e09890 100644
(file)
--- a/
typescript_strings.py
+++ b/
typescript_strings.py
@@
-17,7
+17,7
@@
class Consts:
uint8_t = ['number', 'Uint8Array'],
uint16_t = ['number', 'Uint16Array'],
uint32_t = ['number', 'Uint32Array'],
uint8_t = ['number', 'Uint8Array'],
uint16_t = ['number', 'Uint16Array'],
uint32_t = ['number', 'Uint32Array'],
-
long
= ['number'],
+
uint64_t
= ['number'],
)
self.to_hu_conv_templates = dict(
)
self.to_hu_conv_templates = dict(
@@
-31,8
+31,8
@@
export class VecOrSliceDef {
public datalen: number;
public stride: number;
public constructor(dataptr: number, datalen: number, stride: number) {
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;
}
}
this.stride = stride;
}
}
@@
-73,7
+73,7
@@
public static native long new_empty_slice_vec();
// TODO: finalize myself
}
}
// TODO: finalize myself
}
}
-
"""
+"""
self.c_file_pfx = """#include <rust_types.h>
#include <stdatomic.h>
self.c_file_pfx = """#include <rust_types.h>
#include <stdatomic.h>
@@
-214,7
+214,7
@@
import * as bindings from '../bindings' // TODO: figure out location
self.c_fn_args_pfx = "void* ctx_TODO"
self.file_ext = ".ts"
self.ptr_c_ty = "uint32_t"
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" # "
uint32_t"
self.result_c_ty = "uint32_t"
self.ptr_arr = "uint32_tArray"
self.get_native_arr_len_call = ("", ".len")
self.result_c_ty = "uint32_t"
self.ptr_arr = "uint32_tArray"
self.get_native_arr_len_call = ("", ".len")
@@
-268,7
+268,7
@@
const wasmModule = new WebAssembly.Module(bytes);
const wasmInstance = new WebAssembly.Instance(wasmModule, imports);
// module.exports = wasmInstance.exports;
const wasm = wasmInstance.exports;
const wasmInstance = new WebAssembly.Instance(wasmModule, imports);
// module.exports = wasmInstance.exports;
const wasm = wasmInstance.exports;
-
"""
+"""
return ''
def init_str(self, c_array_class_caches):
return ''
def init_str(self, c_array_class_caches):
@@
-303,7
+303,7
@@
const wasm = wasmInstance.exports;
export enum {struct_name} {{
{out_typescript_enum_fields}
}}
export enum {struct_name} {{
{out_typescript_enum_fields}
}}
-
"""
+"""
return (out_c, out_typescript_enum, "")
return (out_c, out_typescript_enum, "")
@@
-408,15
+408,13
@@
const wasm = wasmInstance.exports;
else:
trait_constructor_arguments += ", " + var[1] + ".new_impl(" + var[1] + "_impl).bindings_instance"
else:
trait_constructor_arguments += ", " + var[1] + ".new_impl(" + var[1] + "_impl).bindings_instance"
-
-
out_typescript_human = f"""
{self.hu_struct_file_prefix}
out_typescript_human = f"""
{self.hu_struct_file_prefix}
-
+
export class {struct_name.replace("LDK","")} extends CommonBase {{
export class {struct_name.replace("LDK","")} extends CommonBase {{
-
+
bindings_instance?: bindings.{struct_name};
bindings_instance?: bindings.{struct_name};
-
+
constructor(ptr?: number, arg?: bindings.{struct_name}{constructor_arguments}) {{
if (Number.isFinite(ptr)) {{
super(ptr);
constructor(ptr?: number, arg?: bindings.{struct_name}{constructor_arguments}) {{
if (Number.isFinite(ptr)) {{
super(ptr);
@@
-428,38
+426,32
@@
const wasm = wasmInstance.exports;
{pointer_to_adder}
}}
}}
{pointer_to_adder}
}}
}}
-
+
protected finalize() {{
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();
}}
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}>{{
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
// todo: in-line interface filling
-
{out_interface_implementation_overrides}
}};
impl_holder.held = new {struct_name.replace("LDK", "")} (null, structImplementation{trait_constructor_arguments});
}}
{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}
}}
export interface {struct_name.replace("LDK", "")}Interface {{
{out_java_interface}
}}
-
+
class {struct_name}Holder {{
held: {struct_name.replace("LDK", "")};
}}
class {struct_name}Holder {{
held: {struct_name.replace("LDK", "")};
}}
-
- """
-
-
+"""
out_typescript_bindings += "\t\texport interface " + struct_name + " {\n"
java_meths = []
out_typescript_bindings += "\t\texport interface " + struct_name + " {\n"
java_meths = []
@@
-486,19
+478,18
@@
const wasm = wasmInstance.exports;
out_typescript_bindings += f"""): number {{
throw new Error('unimplemented'); // TODO: bind to WASM
}}
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
}}
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_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"
+ 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
for var in field_var_conversions:
if isinstance(var, ConvInfo):
# We're a regular ol' field
@@
-508,7
+499,7
@@
const wasm = wasmInstance.exports;
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" + 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
jmethodID
" + fn.fn_name + "_meth;\n"
+ out_c = out_c + "\t
// TODO: Some kind of method pointer
" + fn.fn_name + "_meth;\n"
out_c = out_c + "} " + struct_name + "_JCalls;\n"
for fn_line in field_function_lines:
out_c = out_c + "} " + struct_name + "_JCalls;\n"
for fn_line in field_function_lines:
@@
-516,9
+507,7
@@
const wasm = wasmInstance.exports;
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 + "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"
+ out_c = out_c + "\t\t// TODO: do any release required for j_calls->o (refcnt-- in java, but may be redundant)\n"
out_c = out_c + "\t\tFREE(j_calls);\n"
out_c = out_c + "\t}\n}\n"
out_c = out_c + "\t\tFREE(j_calls);\n"
out_c = out_c + "\t}\n}\n"
@@
-536,8
+525,6
@@
const wasm = wasmInstance.exports;
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 + ") {\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:
for arg_info in fn_line.args_ty:
if arg_info.ret_conv is not None:
@@
-545,13
+532,13
@@
const wasm = wasmInstance.exports;
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 + arg_info.arg_name
out_c = out_c + arg_info.ret_conv[1].replace('\n', '\n\t') + "\n"
- out_c = out_c + "\t
jobject obj = (*env)->NewLocalRef(env, j_calls->o);\n\tCHECK(obj != NULL);
\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"):
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
; // TODO: Call " + fn_line.fn_name + " on j_calls with instance obj, returning an object
"
elif not fn_line.ret_ty_info.passed_as_ptr:
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
0; //TODO: Call " + fn_line.fn_name + " on j_calls with instance obj, retruning " + fn_line.ret_ty_info.java_ty
else:
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
; // TODO: Call " + fn_line.fn_name + " on j_calls with instance obj, returning a pointer
"
for idx, arg_info in enumerate(fn_line.args_ty):
if arg_info.ret_conv is not None:
for idx, arg_info in enumerate(fn_line.args_ty):
if arg_info.ret_conv is not None:
@@
-586,8
+573,7
@@
const wasm = wasmInstance.exports;
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 + "\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":
for (fn_name, java_meth_descr) in java_meths:
if fn_name != "free" and fn_name != "clone":
@@
-647,9
+633,11
@@
const wasm = wasmInstance.exports;
out_c = out_c + "\treturn ret;\n"
out_c = out_c + "}\n"
out_c = out_c + "\treturn ret;\n"
out_c = out_c + "}\n"
-
return (out_typescript_bindings, out_typescript_human, out_c)
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", "")
def map_complex_enum(self, struct_name, variant_list, camel_to_snake):
java_hu_type = struct_name.replace("LDK", "")
@@
-728,32
+716,31
@@
const wasm = wasmInstance.exports;
return (out_java, out_java_enum, out_c)
def map_opaque_struct(self, struct_name):
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() {
implementations = ""
method_header = ""
if struct_name.startswith("LDKLocked"):
implementations += "implements AutoCloseable "
method_header = """
public close() {
-
"""
+"""
else:
method_header = """
protected finalize() {
super.finalize();
else:
method_header = """
protected finalize() {
super.finalize();
-
"""
+"""
out_opaque_struct_human = f"""
{self.hu_struct_file_prefix}
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);
}}
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);
}}
}}
{method_header}
if (this.ptr != 0) {{
bindings.{struct_name.replace("LDK","")}_free(this.ptr);
}}
}}
-
"""
+"""
return out_opaque_struct_human
return out_opaque_struct_human