@grain/binaryen.ml 0.22.0 → 0.24.0

binaryen-archive/src/expression.ml

@@ -703,15 +703,25 @@ module Memory_grow = struct
 end
 
 module Memory_init = struct
-  external make : Module.t -> int -> t -> t -> t -> string -> t
+  external make : Module.t -> string -> t -> t -> t -> string -> t
     = "caml_binaryen_memory_init__bytecode" "caml_binaryen_memory_init"
   (** Module, segment, destination, offset, size, memory_name *)
 
-  external get_segment : t -> int = "caml_binaryen_memory_init_get_segment"
+  (* Binaryen v113 still uses indexes for data segements, so we only want to change the binding itself, not our interface *)
+  let make wasm_mod segment dest offset size memory_name =
+    make wasm_mod (string_of_int segment) dest offset size memory_name
 
-  external set_segment : t -> int -> unit
+  external get_segment : t -> string = "caml_binaryen_memory_init_get_segment"
+
+  (* Binaryen v113 still uses indexes for data segements, so we only want to change the binding itself, not our interface *)
+  let get_segment expr = int_of_string (get_segment expr)
+
+  external set_segment : t -> string -> unit
     = "caml_binaryen_memory_init_set_segment"
 
+  (* Binaryen v113 still uses indexes for data segements, so we only want to change the binding itself, not our interface *)
+  let set_segment expr segment = set_segment expr (string_of_int segment)
+
   external get_dest : t -> t = "caml_binaryen_memory_init_get_dest"
   external set_dest : t -> t -> unit = "caml_binaryen_memory_init_set_dest"
   external get_offset : t -> t = "caml_binaryen_memory_init_get_offset"
@@ -721,13 +731,22 @@ module Memory_init = struct
 end
 
 module Data_drop = struct
-  external make : Module.t -> int -> t = "caml_binaryen_data_drop"
+  external make : Module.t -> string -> t = "caml_binaryen_data_drop"
   (** Module, segment. *)
 
-  external get_segment : t -> int = "caml_binaryen_data_drop_get_segment"
+  (* Binaryen v113 still uses indexes for data segements, so we only want to change the binding itself, not our interface *)
+  let make wasm_mod segment = make wasm_mod (string_of_int segment)
 
-  external set_segment : t -> int -> unit
+  external get_segment : t -> string = "caml_binaryen_data_drop_get_segment"
+
+  (* Binaryen v113 still uses indexes for data segements, so we only want to change the binding itself, not our interface *)
+  let get_segment expr = int_of_string (get_segment expr)
+
+  external set_segment : t -> string -> unit
     = "caml_binaryen_data_drop_set_segment"
+
+  (* Binaryen v113 still uses indexes for data segements, so we only want to change the binding itself, not our interface *)
+  let set_segment expr segment = set_segment expr (string_of_int segment)
 end
 
 module Memory_copy = struct

binaryen-archive/src/op.c

@@ -2303,9 +2303,9 @@ caml_binaryen_string_new_wtf8(value unit) {
 }
 
 CAMLprim value
-caml_binaryen_string_new_replace(value unit) {
+caml_binaryen_string_new_lossy_utf8(value unit) {
   CAMLparam1(unit);
-  BinaryenOp op = BinaryenStringNewReplace();
+  BinaryenOp op = BinaryenStringNewLossyUTF8();
   CAMLreturn(alloc_BinaryenOp(op));
 }
 
@@ -2331,9 +2331,9 @@ caml_binaryen_string_new_wtf8_array(value unit) {
 }
 
 CAMLprim value
-caml_binaryen_string_new_replace_array(value unit) {
+caml_binaryen_string_new_lossy_utf8_array(value unit) {
   CAMLparam1(unit);
-  BinaryenOp op = BinaryenStringNewReplaceArray();
+  BinaryenOp op = BinaryenStringNewLossyUTF8Array();
   CAMLreturn(alloc_BinaryenOp(op));
 }
 
@@ -2393,6 +2393,13 @@ caml_binaryen_string_encode_utf8(value unit) {
   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);
@@ -2414,6 +2421,13 @@ caml_binaryen_string_encode_utf8_array(value unit) {
   CAMLreturn(alloc_BinaryenOp(op));
 }
 
+CAMLprim value
+caml_binaryen_string_encode_lossy_utf8_array(value unit) {
+  CAMLparam1(unit);
+  BinaryenOp op = BinaryenStringEncodeLossyUTF8Array();
+  CAMLreturn(alloc_BinaryenOp(op));
+}
+
 CAMLprim value
 caml_binaryen_string_encode_wtf8_array(value unit) {
   CAMLparam1(unit);

binaryen-archive/src/op.js

@@ -1966,10 +1966,10 @@ function caml_binaryen_string_new_wtf8() {
   return Binaryen.Operations.StringNewWTF8;
 }
 
-//Provides: caml_binaryen_string_new_replace
+//Provides: caml_binaryen_string_new_lossy_utf8
 //Requires: Binaryen
-function caml_binaryen_string_new_replace() {
-  return Binaryen.Operations.StringNewReplace;
+function caml_binaryen_string_new_lossy_utf8() {
+  return Binaryen.Operations.StringNewLossyUTF8;
 }
 
 //Provides: caml_binaryen_string_new_wtf16
@@ -1990,10 +1990,10 @@ function caml_binaryen_string_new_wtf8_array() {
   return Binaryen.Operations.StringNewWTF8Array;
 }
 
-//Provides: caml_binaryen_string_new_replace_array
+//Provides: caml_binaryen_string_new_lossy_utf8_array
 //Requires: Binaryen
-function caml_binaryen_string_new_replace_array() {
-  return Binaryen.Operations.StringNewReplaceArray;
+function caml_binaryen_string_new_lossy_utf8_array() {
+  return Binaryen.Operations.StringNewLossyUTF8Array;
 }
 
 //Provides: caml_binaryen_string_new_wtf16_array
@@ -2044,6 +2044,12 @@ 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() {
@@ -2062,6 +2068,12 @@ 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() {

binaryen-archive/src/op.ml

@@ -1366,9 +1366,10 @@ external string_new_wtf8 : unit -> t = "caml_binaryen_string_new_wtf8"
 
 let string_new_wtf8 = string_new_wtf8 ()
 
-external string_new_replace : unit -> t = "caml_binaryen_string_new_replace"
+external string_new_lossy_utf8 : unit -> t
+  = "caml_binaryen_string_new_lossy_utf8"
 
-let string_new_replace = string_new_replace ()
+let string_new_lossy_utf8 = string_new_lossy_utf8 ()
 
 external string_new_wtf16 : unit -> t = "caml_binaryen_string_new_wtf16"
 
@@ -1384,10 +1385,10 @@ external string_new_wtf8_array : unit -> t
 
 let string_new_wtf8_array = string_new_wtf8_array ()
 
-external string_new_replace_array : unit -> t
-  = "caml_binaryen_string_new_replace_array"
+external string_new_lossy_utf8_array : unit -> t
+  = "caml_binaryen_string_new_lossy_utf8_array"
 
-let string_new_replace_array = string_new_replace_array ()
+let string_new_lossy_utf8_array = string_new_lossy_utf8_array ()
 
 external string_new_wtf16_array : unit -> t
   = "caml_binaryen_string_new_wtf16_array"
@@ -1425,6 +1426,11 @@ 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 ()
@@ -1438,6 +1444,11 @@ external string_encode_utf8_array : unit -> t
 
 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"
 

binaryen-archive/src/op.mli

@@ -328,22 +328,24 @@ val br_on_cast : t
 val br_on_cast_fail : t
 val string_new_utf8 : t
 val string_new_wtf8 : t
-val string_new_replace : 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_replace_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

binaryen-archive/src/passes.ml

@@ -330,7 +330,7 @@ let signature_pruning = "signature-pruning"
 (** apply more specific subtypes to signature types where possible *)
 let signature_refining = "signature-refining"
 
-(** lower sign-ext operations to wasm mvp *)
+(** lower sign-ext operations to wasm mvp and disable the sign extension feature *)
 let signext_lowering = "signext-lowering"
 
 (** miscellaneous globals-related optimizations *)
@@ -387,6 +387,9 @@ let strip_dwarf = "strip-dwarf"
 (** strip the wasm producers section *)
 let strip_producers = "strip-producers"
 
+(** strip EH instructions *)
+let strip_eh = "strip-eh"
+
 (** strip the wasm target features section *)
 let strip_target_features = "strip-target-features"
 

binaryen-archive/src/passes.mli

@@ -384,6 +384,9 @@ val strip_dwarf : t
 val strip_producers : t
 (** strip the wasm producers section *)
 
+val strip_eh : t
+(** strip EH instructions *)
+
 val strip_target_features : t
 (** strip the wasm target features section *)
 

binaryen-archive/test/test.expected

@@ -11,13 +11,13 @@
  (type $none_=>_none (func))
  (type $anyref_i32_i32_=>_i32 (func (param anyref i32 i32) (result i32)))
  (type $anyref_=>_i32 (func (param anyref) (result i32)))
- (import "future-wasi" "write" (func $write (param anyref i32 i32) (result i32)))
+ (import "future-wasi" "write" (func $write (type $anyref_i32_i32_=>_i32) (param anyref i32 i32) (result i32)))
  (global $max_int64 i64 (i64.const 9223372036854775807))
  (global $max_int64_mut (mut i64) (i64.const 9223372036854775807))
  (global $test_float64_bits f64 (f64.const 1.23))
  (memory $0 1)
- (data (i32.const 0) "hello")
- (data "world")
+ (data $0 (i32.const 0) "hello")
+ (data $1 "world")
  (table $table 1 1 funcref)
  (elem $elem (i32.const 0) $adder)
  (export "adder" (func $adder))
@@ -44,7 +44,7 @@
  )
  (func $start (type $none_=>_none)
   (block $start
-   (memory.init 1
+   (memory.init $1
     (i32.const 2048)
     (i32.const 0)
     (i32.const 5)
@@ -71,10 +71,10 @@
  (type $none_=>_none (func))
  (type $anyref_i32_i32_=>_i32 (func (param anyref i32 i32) (result i32)))
  (type $anyref_=>_i32 (func (param anyref) (result i32)))
- (import "future-wasi" "write" (func $write (param anyref i32 i32) (result i32)))
+ (import "future-wasi" "write" (func $write (type $anyref_i32_i32_=>_i32) (param anyref i32 i32) (result i32)))
  (memory $0 1)
- (data (i32.const 0) "hello")
- (data "world")
+ (data $0 (i32.const 0) "hello")
+ (data $1 "world")
  (table $table 1 1 funcref)
  (elem $elem (i32.const 0) $adder)
  (export "adder" (func $adder))
@@ -94,7 +94,7 @@
   )
  )
  (func $start (type $none_=>_none) (; has Stack IR ;)
-  (memory.init 1
+  (memory.init $1
    (i32.const 2048)
    (i32.const 0)
    (i32.const 5)
@@ -119,12 +119,12 @@
  (type $type$1 (func (param i32 i32) (result i32)))
  (type $type$2 (func))
  (type $type$3 (func (param anyref) (result i32)))
- (import "future-wasi" "write" (func $fimport$0 (param anyref i32 i32) (result i32)))
+ (import "future-wasi" "write" (func $fimport$0 (type $type$0) (param anyref i32 i32) (result i32)))
  (memory $0 1)
- (data (i32.const 0) "hello")
- (data "world")
+ (data $0 (i32.const 0) "hello")
+ (data $1 "world")
  (table $0 1 1 funcref)
- (elem (i32.const 0) $0)
+ (elem $0 (i32.const 0) $0)
  (export "adder" (func $0))
  (export "memory" (memory $0))
  (export "hello" (func $2))
@@ -142,7 +142,7 @@
   )
  )
  (func $1 (type $type$2)
-  (memory.init 1
+  (memory.init $1
    (i32.const 2048)
    (i32.const 0)
    (i32.const 5)
@@ -167,12 +167,12 @@
  (type $type$1 (func (param i32 i32) (result i32)))
  (type $type$2 (func))
  (type $type$3 (func (param anyref) (result i32)))
- (import "future-wasi" "write" (func $fimport$0 (param anyref i32 i32) (result i32)))
+ (import "future-wasi" "write" (func $fimport$0 (type $type$0) (param anyref i32 i32) (result i32)))
  (memory $0 1)
- (data (i32.const 0) "hello")
- (data "world")
+ (data $0 (i32.const 0) "hello")
+ (data $1 "world")
  (table $0 1 1 funcref)
- (elem (i32.const 0) $0)
+ (elem $0 (i32.const 0) $0)
  (export "adder" (func $0))
  (export "memory" (memory $0))
  (export "hello" (func $2))
@@ -190,7 +190,7 @@
   i32.const 2048
   i32.const 0
   i32.const 5
-  memory.init $0 1
+  memory.init $0 $1
   i32.const 3
   i32.const 5
   call $0

binaryen-archive/test/test.ml

@@ -248,6 +248,7 @@ let _ =
       Passes.monomorphize;
       Passes.signext_lowering;
       Passes.discard_global_effects;
+      Passes.strip_eh;
     ]
 
 let _ =

binaryen-archive/src/type_system.c

@@ -1,34 +0,0 @@
-#define CAML_NAME_SPACE
-#include <caml/mlvalues.h>
-#include <caml/fail.h>
-#include <caml/memory.h>
-
-#include "binaryen-c.h"
-#include "ocaml_helpers.h"
-
-
-CAMLprim value
-caml_binaryen_type_system_nominal(value unit) {
-  CAMLparam1(unit);
-  CAMLreturn(Val_int(BinaryenTypeSystemNominal()));
-}
-
-CAMLprim value
-caml_binaryen_type_system_isorecursive(value unit) {
-  CAMLparam1(unit);
-  CAMLreturn(Val_int(BinaryenTypeSystemIsorecursive()));
-}
-
-CAMLprim value
-caml_binaryen_get_type_system(value unit) {
-  CAMLparam1(unit);
-  CAMLreturn(Val_int(BinaryenGetTypeSystem()));
-}
-
-CAMLprim value
-caml_binaryen_set_type_system(value _typeSystem) {
-  CAMLparam1(_typeSystem);
-  BinaryenTypeSystem typeSystem = Int_val(_typeSystem);
-  BinaryenSetTypeSystem(typeSystem);
-  CAMLreturn(Val_unit);
-}

binaryen-archive/src/type_system.js

@@ -1,23 +0,0 @@
-//Provides: caml_binaryen_type_system_nominal
-//Requires: Binaryen
-function caml_binaryen_type_system_nominal() {
-  return Binaryen._BinaryenTypeSystemNominal();
-}
-
-//Provides: caml_binaryen_type_system_isorecursive
-//Requires: Binaryen
-function caml_binaryen_type_system_isorecursive() {
-  return Binaryen._BinaryenTypeSystemIsorecursive();
-}
-
-//Provides: caml_binaryen_get_type_system
-//Requires: Binaryen
-function caml_binaryen_get_type_system() {
-  return Binaryen._BinaryenGetTypeSystem();
-}
-
-//Provides: caml_binaryen_set_type_system
-//Requires: Binaryen
-function caml_binaryen_set_type_system(typeSystem) {
-  Binaryen._BinaryenSetTypeSystem(typeSystem);
-}

binaryen-archive/src/type_system.ml

@@ -1,6 +0,0 @@
-type t = int
-
-external nominal : unit -> t = "caml_binaryen_type_system_nominal"
-external isorecursive : unit -> t = "caml_binaryen_type_system_isorecursive"
-external get_type_system : unit -> t = "caml_binaryen_get_type_system"
-external set_type_system : t -> unit = "caml_binaryen_set_type_system"

binaryen-archive/src/type_system.mli

@@ -1,6 +0,0 @@
-type t
-
-val nominal : unit -> t
-val isorecursive : unit -> t
-val get_type_system : unit -> t
-val set_type_system : t -> unit