diff --git a/binaryen.opam b/binaryen.opam index 907da513..b8993b38 100644 --- a/binaryen.opam +++ b/binaryen.opam @@ -16,5 +16,5 @@ depends: [ "dune" {>= "3.0.0"} "dune-configurator" {>= "3.0.0"} "js_of_ocaml-compiler" {>= "6.0.0" < "7.0.0"} - "libbinaryen" {> "117.0.0" < "118.0.0"} + "libbinaryen" {> "118.0.0" < "119.0.0"} ] diff --git a/esy.lock/index.json b/esy.lock/index.json index ddddf7d4..7866c645 100644 --- a/esy.lock/index.json +++ b/esy.lock/index.json @@ -1,5 +1,5 @@ { - "checksum": "3be8605787a43a951f40f7ce3b739916", + "checksum": "6cabedd34420da31165803fc405c807c", "root": "@grain/binaryen.ml@link-dev:./package.json", "node": { "ocaml@5.3.0@d41d8cd9": { @@ -575,20 +575,20 @@ ], "available": "true" }, - "@opam/ocamlformat-rpc-lib@opam:0.27.0@b911ff6f": { - "id": "@opam/ocamlformat-rpc-lib@opam:0.27.0@b911ff6f", + "@opam/ocamlformat-rpc-lib@opam:0.28.1@4c691df7": { + "id": "@opam/ocamlformat-rpc-lib@opam:0.28.1@4c691df7", "name": "@opam/ocamlformat-rpc-lib", - "version": "opam:0.27.0", + "version": "opam:0.28.1", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/dd/ddbf484c076d08f99400ee84b790ec231f5c8fcbd5d3324a6400d5388e846d15#sha256:ddbf484c076d08f99400ee84b790ec231f5c8fcbd5d3324a6400d5388e846d15", - "archive:https://github.com/ocaml-ppx/ocamlformat/releases/download/0.27.0/ocamlformat-0.27.0.tbz#sha256:ddbf484c076d08f99400ee84b790ec231f5c8fcbd5d3324a6400d5388e846d15" + "archive:https://opam.ocaml.org/cache/sha256/70/70bda037d0bed961ed91bdb5198b2eeef542444750a8b015d80ccb94b3ff41fb#sha256:70bda037d0bed961ed91bdb5198b2eeef542444750a8b015d80ccb94b3ff41fb", + "archive:https://github.com/ocaml-ppx/ocamlformat/releases/download/0.28.1/ocamlformat-0.28.1.tbz#sha256:70bda037d0bed961ed91bdb5198b2eeef542444750a8b015d80ccb94b3ff41fb" ], "opam": { "name": "ocamlformat-rpc-lib", - "version": "0.27.0", - "path": "esy.lock/opam/ocamlformat-rpc-lib.0.27.0" + "version": "0.28.1", + "path": "esy.lock/opam/ocamlformat-rpc-lib.0.28.1" } }, "overrides": [], @@ -846,7 +846,7 @@ "@opam/ppx_yojson_conv_lib@opam:v0.17.0@2b444c0e", "@opam/pp@opam:2.0.0@2177bbde", "@opam/ordering@opam:3.20.2@6865c105", - "@opam/ocamlformat-rpc-lib@opam:0.27.0@b911ff6f", + "@opam/ocamlformat-rpc-lib@opam:0.28.1@4c691df7", "@opam/ocamlc-loc@opam:3.20.2@4ca99b2f", "@opam/merlin-lib@opam:5.6-503@f2a59b18", "@opam/lsp@opam:1.23.1@22e2f8da", @@ -869,7 +869,7 @@ "@opam/ppx_yojson_conv_lib@opam:v0.17.0@2b444c0e", "@opam/pp@opam:2.0.0@2177bbde", "@opam/ordering@opam:3.20.2@6865c105", - "@opam/ocamlformat-rpc-lib@opam:0.27.0@b911ff6f", + "@opam/ocamlformat-rpc-lib@opam:0.28.1@4c691df7", "@opam/ocamlc-loc@opam:3.20.2@4ca99b2f", "@opam/merlin-lib@opam:5.6-503@f2a59b18", "@opam/lsp@opam:1.23.1@22e2f8da", @@ -1663,14 +1663,14 @@ "devDependencies": [ "ocaml@5.3.0@d41d8cd9" ], "available": "true" }, - "@grain/libbinaryen@117.0.0-b@d41d8cd9": { - "id": "@grain/libbinaryen@117.0.0-b@d41d8cd9", + "@grain/libbinaryen@118.0.0-b@d41d8cd9": { + "id": "@grain/libbinaryen@118.0.0-b@d41d8cd9", "name": "@grain/libbinaryen", - "version": "117.0.0-b", + "version": "118.0.0-b", "source": { "type": "install", "source": [ - "archive:https://registry.npmjs.org/@grain/libbinaryen/-/libbinaryen-117.0.0-b.tgz#sha1:1bb01d09165c55ffdf06491eecf298a7b88d916c" + "archive:https://registry.npmjs.org/@grain/libbinaryen/-/libbinaryen-118.0.0-b.tgz#sha1:8c5330a7cd5ee8c89b21d8b57da9d4009417db09" ] }, "overrides": [], @@ -1680,7 +1680,8 @@ "@opam/dune@opam:3.20.2@8daef28d", "@opam/conf-cmake@github:grain-lang/cmake:esy.json#033cab656dc71a6488b3c1ca6ea45099f794bd03@d41d8cd9" ], - "devDependencies": [] + "devDependencies": [], + "installConfig": { "pnp": false } }, "@grain/binaryen.ml@link-dev:./package.json": { "id": "@grain/binaryen.ml@link-dev:./package.json", @@ -1696,7 +1697,7 @@ "ocaml@5.3.0@d41d8cd9", "@opam/dune-configurator@opam:3.20.2@7eb6ff01", "@opam/dune@opam:3.20.2@8daef28d", - "@grain/libbinaryen@117.0.0-b@d41d8cd9" + "@grain/libbinaryen@118.0.0-b@d41d8cd9" ], "devDependencies": [ "@opam/ocamlformat@opam:0.27.0@c40d4612", diff --git a/esy.lock/opam/ocamlformat-rpc-lib.0.27.0/opam b/esy.lock/opam/ocamlformat-rpc-lib.0.28.1/opam similarity index 78% rename from esy.lock/opam/ocamlformat-rpc-lib.0.27.0/opam rename to esy.lock/opam/ocamlformat-rpc-lib.0.28.1/opam index 9b9c3ed4..dfb78af3 100644 --- a/esy.lock/opam/ocamlformat-rpc-lib.0.27.0/opam +++ b/esy.lock/opam/ocamlformat-rpc-lib.0.28.1/opam @@ -40,10 +40,10 @@ build: [ dev-repo: "git+https://github.com/ocaml-ppx/ocamlformat.git" url { src: - "https://github.com/ocaml-ppx/ocamlformat/releases/download/0.27.0/ocamlformat-0.27.0.tbz" + "https://github.com/ocaml-ppx/ocamlformat/releases/download/0.28.1/ocamlformat-0.28.1.tbz" checksum: [ - "sha256=ddbf484c076d08f99400ee84b790ec231f5c8fcbd5d3324a6400d5388e846d15" - "sha512=4d2a8965a7b7ad45f8f4e76c01cf38bfa68462b07dfa7bdb2db23bd3e3017b214e6780f036679fa8595dde4167a01d957e3af8837274320449014e306773f917" + "sha256=70bda037d0bed961ed91bdb5198b2eeef542444750a8b015d80ccb94b3ff41fb" + "sha512=8de0517165c6f0cadcedcce66e57cb723956768a8068abd062243abb08fabf292283d0d284be230aa5647d0883a4dc7f28fcf1b70338a2b0c9b17a5bed1bbb71" ] } -x-commit-hash: "5bac2e7f71d9b0a06bd1908dda9b13da1649eee1" +x-commit-hash: "809492a6044557239ed1e1c2f78eec602f068ea4" diff --git a/package.json b/package.json index e5675e0a..5689c779 100644 --- a/package.json +++ b/package.json @@ -4,12 +4,9 @@ "description": "OCaml bindings for Binaryen.", "author": "Oscar Spencer ", "license": "Apache-2.0", - "installConfig": { - "pnp": false - }, "dependencies": { "ocaml": ">= 4.13.0 < 5.4.0", - "@grain/libbinaryen": "117.0.0-b", + "@grain/libbinaryen": "118.0.0-b", "@opam/dune": ">= 3.0.0", "@opam/dune-configurator": ">= 3.0.0" }, diff --git a/src/heap_type.c b/src/heap_type.c index a6ac063c..711e4ff8 100644 --- a/src/heap_type.c +++ b/src/heap_type.c @@ -63,27 +63,6 @@ caml_binaryen_heap_type_string(value unit) { CAMLreturn(alloc_BinaryenHeapType(ty)); } -CAMLprim value -caml_binaryen_heap_type_stringview_wtf8(value unit) { - CAMLparam1(unit); - BinaryenHeapType ty = BinaryenHeapTypeStringviewWTF8(); - CAMLreturn(alloc_BinaryenHeapType(ty)); -} - -CAMLprim value -caml_binaryen_heap_type_stringview_wtf16(value unit) { - CAMLparam1(unit); - BinaryenHeapType ty = BinaryenHeapTypeStringviewWTF16(); - CAMLreturn(alloc_BinaryenHeapType(ty)); -} - -CAMLprim value -caml_binaryen_heap_type_stringview_iter(value unit) { - CAMLparam1(unit); - BinaryenHeapType ty = BinaryenHeapTypeStringviewIter(); - CAMLreturn(alloc_BinaryenHeapType(ty)); -} - CAMLprim value caml_binaryen_heap_type_none(value unit) { CAMLparam1(unit); diff --git a/src/heap_type.js b/src/heap_type.js index 095ba4ae..b14ac2c7 100644 --- a/src/heap_type.js +++ b/src/heap_type.js @@ -46,24 +46,6 @@ function caml_binaryen_heap_type_string() { return Binaryen._BinaryenHeapTypeString(); } -//Provides: caml_binaryen_heap_type_stringview_wtf8 -//Requires: Binaryen -function caml_binaryen_heap_type_stringview_wtf8() { - return Binaryen._BinaryenHeapTypeStringviewWTF8(); -} - -//Provides: caml_binaryen_heap_type_stringview_wtf16 -//Requires: Binaryen -function caml_binaryen_heap_type_stringview_wtf16() { - return Binaryen._BinaryenHeapTypeStringviewWTF16(); -} - -//Provides: caml_binaryen_heap_type_stringview_iter -//Requires: Binaryen -function caml_binaryen_heap_type_stringview_iter() { - return Binaryen._BinaryenHeapTypeStringviewIter(); -} - //Provides: caml_binaryen_heap_type_none //Requires: Binaryen function caml_binaryen_heap_type_none() { diff --git a/src/heap_type.ml b/src/heap_type.ml index 56c809d4..44271e44 100644 --- a/src/heap_type.ml +++ b/src/heap_type.ml @@ -8,12 +8,6 @@ external i31 : unit -> t = "caml_binaryen_heap_type_i31" external struct_ : unit -> t = "caml_binaryen_heap_type_struct" external array : unit -> t = "caml_binaryen_heap_type_array" external string : unit -> t = "caml_binaryen_heap_type_string" -external stringview_wtf8 : unit -> t = "caml_binaryen_heap_type_stringview_wtf8" - -external stringview_wtf16 : unit -> t - = "caml_binaryen_heap_type_stringview_wtf16" - -external stringview_iter : unit -> t = "caml_binaryen_heap_type_stringview_iter" external none : unit -> t = "caml_binaryen_heap_type_none" external noext : unit -> t = "caml_binaryen_heap_type_noext" external nofunc : unit -> t = "caml_binaryen_heap_type_nofunc" diff --git a/src/heap_type.mli b/src/heap_type.mli index 9c4f207c..ff28fa8f 100644 --- a/src/heap_type.mli +++ b/src/heap_type.mli @@ -8,9 +8,6 @@ val i31 : unit -> t val struct_ : unit -> t val array : unit -> t val string : unit -> t -val stringview_wtf8 : unit -> t -val stringview_wtf16 : unit -> t -val stringview_iter : unit -> t val none : unit -> t val noext : unit -> t val nofunc : unit -> t diff --git a/src/module.c b/src/module.c index 70009a80..9b58fce0 100644 --- a/src/module.c +++ b/src/module.c @@ -44,10 +44,9 @@ caml_binaryen_module_print_asmjs(value module) { } CAMLprim value -caml_binaryen_module_print_stack_ir(value module, value _optimize) { - CAMLparam2(module, _optimize); - bool optimize = Bool_val(_optimize); - BinaryenModulePrintStackIR(BinaryenModuleRef_val(module), optimize); +caml_binaryen_module_print_stack_ir(value module) { + CAMLparam1(module); + BinaryenModulePrintStackIR(BinaryenModuleRef_val(module)); CAMLreturn(Val_unit); } @@ -127,11 +126,10 @@ caml_binaryen_module_write_text(value _module) { // There is something weird with this function that causes a bunch of newlines to // be printed on stdout when calling it. Not sure if that's a bug in Binaryen. CAMLprim value -caml_binaryen_module_write_stack_ir(value _module, value _optimize) { - CAMLparam2(_module, _optimize); +caml_binaryen_module_write_stack_ir(value _module) { + CAMLparam1(_module); BinaryenModuleRef module = BinaryenModuleRef_val(_module); - bool optimize = Bool_val(_optimize); - char* result = BinaryenModuleAllocateAndWriteStackIR(module, optimize); + char* result = BinaryenModuleAllocateAndWriteStackIR(module); CAMLlocal1(text); text = caml_copy_string(result); free(result); diff --git a/src/module.js b/src/module.js index dbe0492d..dfd0612c 100644 --- a/src/module.js +++ b/src/module.js @@ -40,10 +40,10 @@ function caml_binaryen_module_print_asmjs(wasm_mod) { //Provides: caml_binaryen_module_print_stack_ir //Requires: caml_sys_fds -//Requires: caml_string_of_jsstring, caml_js_from_bool +//Requires: caml_string_of_jsstring //Requires: caml_ml_output, caml_ml_string_length -function caml_binaryen_module_print_stack_ir(wasm_mod, optimize) { - var stackir = wasm_mod.emitStackIR(caml_js_from_bool(optimize)); +function caml_binaryen_module_print_stack_ir(wasm_mod) { + var stackir = wasm_mod.emitStackIR(); var chanid = caml_sys_fds[1].chanid; // stdout var s = caml_string_of_jsstring(stackir); caml_ml_output(chanid, s, 0, caml_ml_string_length(s)); @@ -96,9 +96,9 @@ function caml_binaryen_module_write_text(wasm_mod) { } //Provides: caml_binaryen_module_write_stack_ir -//Requires: caml_string_of_jsstring, caml_js_from_bool -function caml_binaryen_module_write_stack_ir(wasm_mod, optimize) { - var text = wasm_mod.emitStackIR(caml_js_from_bool(optimize)); +//Requires: caml_string_of_jsstring +function caml_binaryen_module_write_stack_ir(wasm_mod) { + var text = wasm_mod.emitStackIR(); return caml_string_of_jsstring(text); } diff --git a/src/module.ml b/src/module.ml index 949f0c02..1ff201ea 100644 --- a/src/module.ml +++ b/src/module.ml @@ -90,10 +90,7 @@ external add_custom_section : t -> string -> string -> unit external parse : string -> t = "caml_binaryen_module_parse" external print : t -> unit = "caml_binaryen_module_print" external print_asmjs : t -> unit = "caml_binaryen_module_print_asmjs" - -external print_stack_ir : t -> bool -> unit - = "caml_binaryen_module_print_stack_ir" - +external print_stack_ir : t -> unit = "caml_binaryen_module_print_stack_ir" external validate : t -> int = "caml_binaryen_module_validate" external optimize : t -> unit = "caml_binaryen_module_optimize" external get_features : t -> int = "caml_binaryen_module_get_features" @@ -124,10 +121,7 @@ external write : t -> string option -> bytes * string option = "caml_binaryen_module_write" external write_text : t -> string = "caml_binaryen_module_write_text" - -external write_stack_ir : t -> bool -> string - = "caml_binaryen_module_write_stack_ir" - +external write_stack_ir : t -> string = "caml_binaryen_module_write_stack_ir" external read : bytes -> t = "caml_binaryen_module_read" external interpret : t -> unit = "caml_binaryen_module_interpret" diff --git a/src/module.mli b/src/module.mli index 4be369ed..dfbdef56 100644 --- a/src/module.mli +++ b/src/module.mli @@ -29,7 +29,7 @@ val add_custom_section : t -> string -> string -> unit val parse : string -> t val print : t -> unit val print_asmjs : t -> unit -val print_stack_ir : t -> bool -> unit +val print_stack_ir : t -> unit val validate : t -> int val optimize : t -> unit val get_features : t -> Feature.t list @@ -38,7 +38,7 @@ val run_passes : t -> Passes.t list -> unit val auto_drop : t -> unit val write : t -> string option -> bytes * string option val write_text : t -> string -val write_stack_ir : t -> bool -> string +val write_stack_ir : t -> string val read : bytes -> t val interpret : t -> unit val add_debug_info_filename : t -> string -> int diff --git a/src/op.c b/src/op.c index 1b22510f..e39a3bd7 100644 --- a/src/op.c +++ b/src/op.c @@ -2288,48 +2288,6 @@ caml_binaryen_br_on_cast_fail(value unit) { CAMLreturn(alloc_BinaryenOp(op)); } -CAMLprim value -caml_binaryen_string_new_utf8(value unit) { - CAMLparam1(unit); - BinaryenOp op = BinaryenStringNewUTF8(); - CAMLreturn(alloc_BinaryenOp(op)); -} - -CAMLprim value -caml_binaryen_string_new_wtf8(value unit) { - CAMLparam1(unit); - BinaryenOp op = BinaryenStringNewWTF8(); - CAMLreturn(alloc_BinaryenOp(op)); -} - -CAMLprim value -caml_binaryen_string_new_lossy_utf8(value unit) { - CAMLparam1(unit); - BinaryenOp op = BinaryenStringNewLossyUTF8(); - CAMLreturn(alloc_BinaryenOp(op)); -} - -CAMLprim value -caml_binaryen_string_new_wtf16(value unit) { - CAMLparam1(unit); - BinaryenOp op = BinaryenStringNewWTF16(); - CAMLreturn(alloc_BinaryenOp(op)); -} - -CAMLprim value -caml_binaryen_string_new_utf8_array(value unit) { - CAMLparam1(unit); - BinaryenOp op = BinaryenStringNewUTF8Array(); - CAMLreturn(alloc_BinaryenOp(op)); -} - -CAMLprim value -caml_binaryen_string_new_wtf8_array(value unit) { - CAMLparam1(unit); - BinaryenOp op = BinaryenStringNewWTF8Array(); - CAMLreturn(alloc_BinaryenOp(op)); -} - CAMLprim value caml_binaryen_string_new_lossy_utf8_array(value unit) { CAMLparam1(unit); @@ -2358,13 +2316,6 @@ caml_binaryen_string_measure_utf8(value unit) { CAMLreturn(alloc_BinaryenOp(op)); } -CAMLprim value -caml_binaryen_string_measure_wtf8(value unit) { - CAMLparam1(unit); - BinaryenOp op = BinaryenStringMeasureWTF8(); - CAMLreturn(alloc_BinaryenOp(op)); -} - CAMLprim value caml_binaryen_string_measure_wtf16(value unit) { CAMLparam1(unit); @@ -2372,55 +2323,6 @@ caml_binaryen_string_measure_wtf16(value unit) { CAMLreturn(alloc_BinaryenOp(op)); } -CAMLprim value -caml_binaryen_string_measure_is_usv(value unit) { - CAMLparam1(unit); - BinaryenOp op = BinaryenStringMeasureIsUSV(); - CAMLreturn(alloc_BinaryenOp(op)); -} - -CAMLprim value -caml_binaryen_string_measure_wtf16_view(value unit) { - CAMLparam1(unit); - BinaryenOp op = BinaryenStringMeasureWTF16View(); - CAMLreturn(alloc_BinaryenOp(op)); -} - -CAMLprim value -caml_binaryen_string_encode_utf8(value unit) { - CAMLparam1(unit); - BinaryenOp op = BinaryenStringEncodeUTF8(); - CAMLreturn(alloc_BinaryenOp(op)); -} - -CAMLprim value -caml_binaryen_string_encode_lossy_utf8(value unit) { - CAMLparam1(unit); - BinaryenOp op = BinaryenStringEncodeLossyUTF8(); - CAMLreturn(alloc_BinaryenOp(op)); -} - -CAMLprim value -caml_binaryen_string_encode_wtf8(value unit) { - CAMLparam1(unit); - BinaryenOp op = BinaryenStringEncodeWTF8(); - CAMLreturn(alloc_BinaryenOp(op)); -} - -CAMLprim value -caml_binaryen_string_encode_wtf16(value unit) { - CAMLparam1(unit); - BinaryenOp op = BinaryenStringEncodeWTF16(); - CAMLreturn(alloc_BinaryenOp(op)); -} - -CAMLprim value -caml_binaryen_string_encode_utf8_array(value unit) { - CAMLparam1(unit); - BinaryenOp op = BinaryenStringEncodeUTF8Array(); - CAMLreturn(alloc_BinaryenOp(op)); -} - CAMLprim value caml_binaryen_string_encode_lossy_utf8_array(value unit) { CAMLparam1(unit); @@ -2428,13 +2330,6 @@ caml_binaryen_string_encode_lossy_utf8_array(value unit) { CAMLreturn(alloc_BinaryenOp(op)); } -CAMLprim value -caml_binaryen_string_encode_wtf8_array(value unit) { - CAMLparam1(unit); - BinaryenOp op = BinaryenStringEncodeWTF8Array(); - CAMLreturn(alloc_BinaryenOp(op)); -} - CAMLprim value caml_binaryen_string_encode_wtf16_array(value unit) { CAMLparam1(unit); @@ -2442,55 +2337,6 @@ caml_binaryen_string_encode_wtf16_array(value unit) { CAMLreturn(alloc_BinaryenOp(op)); } -CAMLprim value -caml_binaryen_string_as_wtf8(value unit) { - CAMLparam1(unit); - BinaryenOp op = BinaryenStringAsWTF8(); - CAMLreturn(alloc_BinaryenOp(op)); -} - -CAMLprim value -caml_binaryen_string_as_wtf16(value unit) { - CAMLparam1(unit); - BinaryenOp op = BinaryenStringAsWTF16(); - CAMLreturn(alloc_BinaryenOp(op)); -} - -CAMLprim value -caml_binaryen_string_as_iter(value unit) { - CAMLparam1(unit); - BinaryenOp op = BinaryenStringAsIter(); - CAMLreturn(alloc_BinaryenOp(op)); -} - -CAMLprim value -caml_binaryen_string_iter_move_advance(value unit) { - CAMLparam1(unit); - BinaryenOp op = BinaryenStringIterMoveAdvance(); - CAMLreturn(alloc_BinaryenOp(op)); -} - -CAMLprim value -caml_binaryen_string_iter_move_rewind(value unit) { - CAMLparam1(unit); - BinaryenOp op = BinaryenStringIterMoveRewind(); - CAMLreturn(alloc_BinaryenOp(op)); -} - -CAMLprim value -caml_binaryen_string_slice_wtf8(value unit) { - CAMLparam1(unit); - BinaryenOp op = BinaryenStringSliceWTF8(); - CAMLreturn(alloc_BinaryenOp(op)); -} - -CAMLprim value -caml_binaryen_string_slice_wtf16(value unit) { - CAMLparam1(unit); - BinaryenOp op = BinaryenStringSliceWTF16(); - CAMLreturn(alloc_BinaryenOp(op)); -} - CAMLprim value caml_binaryen_string_eq_equal(value unit) { CAMLparam1(unit); diff --git a/src/op.js b/src/op.js index 1a0f0dce..f99ffd99 100644 --- a/src/op.js +++ b/src/op.js @@ -1954,42 +1954,6 @@ function caml_binaryen_br_on_cast_fail() { return Binaryen.Operations.BrOnCastFail; } -//Provides: caml_binaryen_string_new_utf8 -//Requires: Binaryen -function caml_binaryen_string_new_utf8() { - return Binaryen.Operations.StringNewUTF8; -} - -//Provides: caml_binaryen_string_new_wtf8 -//Requires: Binaryen -function caml_binaryen_string_new_wtf8() { - return Binaryen.Operations.StringNewWTF8; -} - -//Provides: caml_binaryen_string_new_lossy_utf8 -//Requires: Binaryen -function caml_binaryen_string_new_lossy_utf8() { - return Binaryen.Operations.StringNewLossyUTF8; -} - -//Provides: caml_binaryen_string_new_wtf16 -//Requires: Binaryen -function caml_binaryen_string_new_wtf16() { - return Binaryen.Operations.StringNewWTF16; -} - -//Provides: caml_binaryen_string_new_utf8_array -//Requires: Binaryen -function caml_binaryen_string_new_utf8_array() { - return Binaryen.Operations.StringNewUTF8Array; -} - -//Provides: caml_binaryen_string_new_wtf8_array -//Requires: Binaryen -function caml_binaryen_string_new_wtf8_array() { - return Binaryen.Operations.StringNewWTF8Array; -} - //Provides: caml_binaryen_string_new_lossy_utf8_array //Requires: Binaryen function caml_binaryen_string_new_lossy_utf8_array() { @@ -2014,120 +1978,24 @@ function caml_binaryen_string_measure_utf8() { return Binaryen.Operations.StringMeasureUTF8; } -//Provides: caml_binaryen_string_measure_wtf8 -//Requires: Binaryen -function caml_binaryen_string_measure_wtf8() { - return Binaryen.Operations.StringMeasureWTF8; -} - //Provides: caml_binaryen_string_measure_wtf16 //Requires: Binaryen function caml_binaryen_string_measure_wtf16() { return Binaryen.Operations.StringMeasureWTF16; } -//Provides: caml_binaryen_string_measure_is_usv -//Requires: Binaryen -function caml_binaryen_string_measure_is_usv() { - return Binaryen.Operations.StringMeasureIsUSV; -} - -//Provides: caml_binaryen_string_measure_wtf16_view -//Requires: Binaryen -function caml_binaryen_string_measure_wtf16_view() { - return Binaryen.Operations.StringMeasureWTF16View; -} - -//Provides: caml_binaryen_string_encode_utf8 -//Requires: Binaryen -function caml_binaryen_string_encode_utf8() { - return Binaryen.Operations.StringEncodeUTF8; -} - -//Provides: caml_binaryen_string_encode_lossy_utf8 -//Requires: Binaryen -function caml_binaryen_string_encode_lossy_utf8() { - return Binaryen.Operations.StringEncodeLossyUTF8; -} - -//Provides: caml_binaryen_string_encode_wtf8 -//Requires: Binaryen -function caml_binaryen_string_encode_wtf8() { - return Binaryen.Operations.StringEncodeWTF8; -} - -//Provides: caml_binaryen_string_encode_wtf16 -//Requires: Binaryen -function caml_binaryen_string_encode_wtf16() { - return Binaryen.Operations.StringEncodeWTF16; -} - -//Provides: caml_binaryen_string_encode_utf8_array -//Requires: Binaryen -function caml_binaryen_string_encode_utf8_array() { - return Binaryen.Operations.StringEncodeUTF8Array; -} - //Provides: caml_binaryen_string_encode_lossy_utf8_array //Requires: Binaryen function caml_binaryen_string_encode_lossy_utf8_array() { return Binaryen.Operations.StringEncodeLossyUTF8Array; } -//Provides: caml_binaryen_string_encode_wtf8_array -//Requires: Binaryen -function caml_binaryen_string_encode_wtf8_array() { - return Binaryen.Operations.StringEncodeWTF8Array; -} - //Provides: caml_binaryen_string_encode_wtf16_array //Requires: Binaryen function caml_binaryen_string_encode_wtf16_array() { return Binaryen.Operations.StringEncodeWTF16Array; } -//Provides: caml_binaryen_string_as_wtf8 -//Requires: Binaryen -function caml_binaryen_string_as_wtf8() { - return Binaryen.Operations.StringAsWTF8; -} - -//Provides: caml_binaryen_string_as_wtf16 -//Requires: Binaryen -function caml_binaryen_string_as_wtf16() { - return Binaryen.Operations.StringAsWTF16; -} - -//Provides: caml_binaryen_string_as_iter -//Requires: Binaryen -function caml_binaryen_string_as_iter() { - return Binaryen.Operations.StringAsIter; -} - -//Provides: caml_binaryen_string_iter_move_advance -//Requires: Binaryen -function caml_binaryen_string_iter_move_advance() { - return Binaryen.Operations.StringIterMoveAdvance; -} - -//Provides: caml_binaryen_string_iter_move_rewind -//Requires: Binaryen -function caml_binaryen_string_iter_move_rewind() { - return Binaryen.Operations.StringIterMoveRewind; -} - -//Provides: caml_binaryen_string_slice_wtf8 -//Requires: Binaryen -function caml_binaryen_string_slice_wtf8() { - return Binaryen.Operations.StringSliceWTF8; -} - -//Provides: caml_binaryen_string_slice_wtf16 -//Requires: Binaryen -function caml_binaryen_string_slice_wtf16() { - return Binaryen.Operations.StringSliceWTF16; -} - //Provides: caml_binaryen_string_eq_equal //Requires: Binaryen function caml_binaryen_string_eq_equal() { diff --git a/src/op.ml b/src/op.ml index b181265a..a0091b90 100644 --- a/src/op.ml +++ b/src/op.ml @@ -1358,33 +1358,6 @@ external br_on_cast_fail : unit -> t = "caml_binaryen_br_on_cast_fail" let br_on_cast_fail = br_on_cast_fail () -external string_new_utf8 : unit -> t = "caml_binaryen_string_new_utf8" - -let string_new_utf8 = string_new_utf8 () - -external string_new_wtf8 : unit -> t = "caml_binaryen_string_new_wtf8" - -let string_new_wtf8 = string_new_wtf8 () - -external string_new_lossy_utf8 : unit -> t - = "caml_binaryen_string_new_lossy_utf8" - -let string_new_lossy_utf8 = string_new_lossy_utf8 () - -external string_new_wtf16 : unit -> t = "caml_binaryen_string_new_wtf16" - -let string_new_wtf16 = string_new_wtf16 () - -external string_new_utf8_array : unit -> t - = "caml_binaryen_string_new_utf8_array" - -let string_new_utf8_array = string_new_utf8_array () - -external string_new_wtf8_array : unit -> t - = "caml_binaryen_string_new_wtf8_array" - -let string_new_wtf8_array = string_new_wtf8_array () - external string_new_lossy_utf8_array : unit -> t = "caml_binaryen_string_new_lossy_utf8_array" @@ -1404,91 +1377,20 @@ external string_measure_utf8 : unit -> t = "caml_binaryen_string_measure_utf8" let string_measure_utf8 = string_measure_utf8 () -external string_measure_wtf8 : unit -> t = "caml_binaryen_string_measure_wtf8" - -let string_measure_wtf8 = string_measure_wtf8 () - external string_measure_wtf16 : unit -> t = "caml_binaryen_string_measure_wtf16" let string_measure_wtf16 = string_measure_wtf16 () -external string_measure_is_usv : unit -> t - = "caml_binaryen_string_measure_is_usv" - -let string_measure_is_usv = string_measure_is_usv () - -external string_measure_wtf16_view : unit -> t - = "caml_binaryen_string_measure_wtf16_view" - -let string_measure_wtf16_view = string_measure_wtf16_view () - -external string_encode_utf8 : unit -> t = "caml_binaryen_string_encode_utf8" - -let string_encode_utf8 = string_encode_utf8 () - -external string_encode_lossy_utf8 : unit -> t - = "caml_binaryen_string_encode_lossy_utf8" - -let string_encode_lossy_utf8 = string_encode_lossy_utf8 () - -external string_encode_wtf8 : unit -> t = "caml_binaryen_string_encode_wtf8" - -let string_encode_wtf8 = string_encode_wtf8 () - -external string_encode_wtf16 : unit -> t = "caml_binaryen_string_encode_wtf16" - -let string_encode_wtf16 = string_encode_wtf16 () - -external string_encode_utf8_array : unit -> t - = "caml_binaryen_string_encode_utf8_array" - -let string_encode_utf8_array = string_encode_utf8_array () - external string_encode_lossy_utf8_array : unit -> t = "caml_binaryen_string_encode_lossy_utf8_array" let string_encode_lossy_utf8_array = string_encode_lossy_utf8_array () -external string_encode_wtf8_array : unit -> t - = "caml_binaryen_string_encode_wtf8_array" - -let string_encode_wtf8_array = string_encode_wtf8_array () - external string_encode_wtf16_array : unit -> t = "caml_binaryen_string_encode_wtf16_array" let string_encode_wtf16_array = string_encode_wtf16_array () -external string_as_wtf8 : unit -> t = "caml_binaryen_string_as_wtf8" - -let string_as_wtf8 = string_as_wtf8 () - -external string_as_wtf16 : unit -> t = "caml_binaryen_string_as_wtf16" - -let string_as_wtf16 = string_as_wtf16 () - -external string_as_iter : unit -> t = "caml_binaryen_string_as_iter" - -let string_as_iter = string_as_iter () - -external string_iter_move_advance : unit -> t - = "caml_binaryen_string_iter_move_advance" - -let string_iter_move_advance = string_iter_move_advance () - -external string_iter_move_rewind : unit -> t - = "caml_binaryen_string_iter_move_rewind" - -let string_iter_move_rewind = string_iter_move_rewind () - -external string_slice_wtf8 : unit -> t = "caml_binaryen_string_slice_wtf8" - -let string_slice_wtf8 = string_slice_wtf8 () - -external string_slice_wtf16 : unit -> t = "caml_binaryen_string_slice_wtf16" - -let string_slice_wtf16 = string_slice_wtf16 () - external string_eq_equal : unit -> t = "caml_binaryen_string_eq_equal" let string_eq_equal = string_eq_equal () diff --git a/src/op.mli b/src/op.mli index 18eea0e9..66261ea4 100644 --- a/src/op.mli +++ b/src/op.mli @@ -326,34 +326,12 @@ val br_on_null : t val br_on_non_null : t val br_on_cast : t val br_on_cast_fail : t -val string_new_utf8 : t -val string_new_wtf8 : t -val string_new_lossy_utf8 : t -val string_new_wtf16 : t -val string_new_utf8_array : t -val string_new_wtf8_array : t val string_new_wtf16_array : t val string_new_from_code_point : t val string_measure_utf8 : t -val string_measure_wtf8 : t val string_new_lossy_utf8_array : t val string_measure_wtf16 : t -val string_measure_is_usv : t -val string_measure_wtf16_view : t -val string_encode_utf8 : t -val string_encode_lossy_utf8 : t -val string_encode_wtf8 : t -val string_encode_wtf16 : t -val string_encode_utf8_array : t val string_encode_lossy_utf8_array : t -val string_encode_wtf8_array : t val string_encode_wtf16_array : t -val string_as_wtf8 : t -val string_as_wtf16 : t -val string_as_iter : t -val string_iter_move_advance : t -val string_iter_move_rewind : t -val string_slice_wtf8 : t -val string_slice_wtf16 : t val string_eq_equal : t val string_eq_compare : t diff --git a/src/type.c b/src/type.c index f5c969a1..43855ec5 100644 --- a/src/type.c +++ b/src/type.c @@ -97,27 +97,6 @@ caml_binaryen_type_stringref(value unit) { CAMLreturn(alloc_BinaryenType(ty)); } -CAMLprim value -caml_binaryen_type_stringview_wtf8(value unit) { - CAMLparam1(unit); - BinaryenType ty = BinaryenTypeStringviewWTF8(); - CAMLreturn(alloc_BinaryenType(ty)); -} - -CAMLprim value -caml_binaryen_type_stringview_wtf16(value unit) { - CAMLparam1(unit); - BinaryenType ty = BinaryenTypeStringviewWTF16(); - CAMLreturn(alloc_BinaryenType(ty)); -} - -CAMLprim value -caml_binaryen_type_stringview_iter(value unit) { - CAMLparam1(unit); - BinaryenType ty = BinaryenTypeStringviewIter(); - CAMLreturn(alloc_BinaryenType(ty)); -} - CAMLprim value caml_binaryen_type_nullref(value unit) { CAMLparam1(unit); diff --git a/src/type.js b/src/type.js index 1b4911f6..23350368 100644 --- a/src/type.js +++ b/src/type.js @@ -77,24 +77,6 @@ function caml_binaryen_type_stringref() { return Binaryen.stringref; } -//Provides: caml_binaryen_type_stringview_wtf8 -//Requires: Binaryen -function caml_binaryen_type_stringview_wtf8() { - return Binaryen.stringview_wtf8; -} - -//Provides: caml_binaryen_type_stringview_wtf16 -//Requires: Binaryen -function caml_binaryen_type_stringview_wtf16() { - return Binaryen.stringview_wtf16; -} - -//Provides: caml_binaryen_type_stringview_iter -//Requires: Binaryen -function caml_binaryen_type_stringview_iter() { - return Binaryen.stringview_iter; -} - //Provides: caml_binaryen_type_nullref //Requires: Binaryen function caml_binaryen_type_nullref() { diff --git a/src/type.ml b/src/type.ml index e39bd1db..119be8cc 100644 --- a/src/type.ml +++ b/src/type.ml @@ -52,18 +52,6 @@ external stringref : unit -> t = "caml_binaryen_type_stringref" let stringref = stringref () -external stringview_wtf8 : unit -> t = "caml_binaryen_type_stringview_wtf8" - -let stringview_wtf8 = stringview_wtf8 () - -external stringview_wtf16 : unit -> t = "caml_binaryen_type_stringview_wtf16" - -let stringview_wtf16 = stringview_wtf16 () - -external stringview_iter : unit -> t = "caml_binaryen_type_stringview_iter" - -let stringview_iter = stringview_iter () - external nullref : unit -> t = "caml_binaryen_type_nullref" let nullref = nullref () diff --git a/src/type.mli b/src/type.mli index c0bc8e6a..874ddb37 100644 --- a/src/type.mli +++ b/src/type.mli @@ -13,9 +13,6 @@ val i31ref : t val structref : t val arrayref : t val stringref : t -val stringview_wtf8 : t -val stringview_wtf16 : t -val stringview_iter : t val nullref : t val null_externref : t val null_funcref : t diff --git a/test/test.expected b/test/test.expected index d08e43d2..8e1c7db2 100644 --- a/test/test.expected +++ b/test/test.expected @@ -83,7 +83,7 @@ (export "memory" (memory $0)) (export "hello" (func $hello)) (start $start) - (func $adder (type $0) (; has Stack IR ;) (param $0 i32) (param $1 i32) (result i32) + (func $adder (type $0) (param $0 i32) (param $1 i32) (result i32) (i32.add (select (local.get $0) @@ -95,7 +95,7 @@ (local.get $1) ) ) - (func $start (type $1) (; has Stack IR ;) + (func $start (type $1) (memory.init $world (i32.const 2048) (i32.const 0) @@ -108,7 +108,7 @@ ) ) ) - (func $hello (type $3) (; has Stack IR ;) (param $0 anyref) (result i32) + (func $hello (type $3) (param $0 anyref) (result i32) (call $write (local.get $0) (i32.const 0) diff --git a/test/test.ml b/test/test.ml index b1b6a7bf..5eca7571 100644 --- a/test/test.ml +++ b/test/test.ml @@ -278,7 +278,7 @@ let _ = let _ = Module.validate new_mod let _ = Module.print new_mod -let _ = Module.print_stack_ir new_mod false +let _ = Module.print_stack_ir new_mod (* Dispose the modules 👋 *)