@grain/binaryen.ml 0.21.0 → 0.23.0

binaryen-archive/src/expression.js

@@ -457,7 +457,7 @@ function caml_binaryen_memory_init(
   memoryName
 ) {
   return wasm_mod.memory.init(
-    segment,
+    caml_jsstring_of_string(segment),
     dest,
     offset,
     size,
@@ -478,8 +478,9 @@ function caml_binaryen_memory_init__bytecode() {
 }
 
 //Provides: caml_binaryen_data_drop
+//Requires: caml_jsstring_of_string
 function caml_binaryen_data_drop(wasm_mod, segment) {
-  return wasm_mod.data.drop(segment);
+  return wasm_mod.data.drop(caml_jsstring_of_string(segment));
 }
 
 //Provides: caml_binaryen_memory_copy
@@ -541,6 +542,20 @@ function caml_binaryen_pop(wasm_mod, typ) {
   return Binaryen._BinaryenPop(wasm_mod, typ);
 }
 
+//Provides: caml_binaryen_i31_new
+function caml_binaryen_i31_new(wasm_mod, typ) {
+  return wasm_mod.i31.new(typ);
+}
+
+//Provides: caml_binaryen_i31_get
+function caml_binaryen_i31_get(wasm_mod, typ, signed) {
+  if (signed) {
+    return wasm_mod.i31.get_s(typ);
+  } else {
+    return wasm_mod.i31.get_u(typ);
+  }
+}
+
 //Provides: caml_binaryen_expression_id_invalid
 //Requires: Binaryen
 function caml_binaryen_expression_id_invalid() {
@@ -752,10 +767,10 @@ function caml_binaryen_expression_id_pop() {
 function caml_binaryen_expression_id_ref_null() {
   return Binaryen.RefNullId;
 }
-//Provides: caml_binaryen_expression_id_ref_is
+//Provides: caml_binaryen_expression_id_ref_is_null
 //Requires: Binaryen
-function caml_binaryen_expression_id_ref_is() {
-  return Binaryen.RefIsId;
+function caml_binaryen_expression_id_ref_is_null() {
+  return Binaryen.RefIsNullId;
 }
 //Provides: caml_binaryen_expression_id_ref_as
 //Requires: Binaryen
@@ -1479,14 +1494,16 @@ function caml_binaryen_return_set_value(exp, value) {
 
 //Provides: caml_binaryen_memory_init_get_segment
 //Requires: Binaryen
-function caml_binaryen_memory_init_get_segment(exp) {
-  return Binaryen.MemoryInit.getSegment(exp);
+//Requires: caml_string_of_jsstring
+function caml_binaryen_memory_init_get_segment(expr) {
+  return caml_string_of_jsstring(Binaryen.MemoryInit.getSegment(expr));
 }
 
 //Provides: caml_binaryen_memory_init_set_segment
 //Requires: Binaryen
-function caml_binaryen_memory_init_set_segment(exp, value) {
-  return Binaryen.MemoryInit.setSegment(exp, value);
+//Requires: caml_jsstring_of_string
+function caml_binaryen_memory_init_set_segment(expr, segment) {
+  return Binaryen.MemoryInit.setSegment(expr, caml_jsstring_of_string(segment));
 }
 
 //Provides: caml_binaryen_memory_init_get_dest
@@ -1527,14 +1544,16 @@ function caml_binaryen_memory_init_set_size(exp, value) {
 
 //Provides: caml_binaryen_data_drop_get_segment
 //Requires: Binaryen
-function caml_binaryen_data_drop_get_segment(exp) {
-  return Binaryen.DataDrop.getSegment(exp);
+//Requires: caml_string_of_jsstring
+function caml_binaryen_data_drop_get_segment(expr) {
+  return caml_string_of_jsstring(Binaryen.DataDrop.getSegment(expr));
 }
 
 //Provides: caml_binaryen_data_drop_set_segment
 //Requires: Binaryen
-function caml_binaryen_data_drop_set_segment(exp, value) {
-  return Binaryen.DataDrop.setSegment(exp, value);
+//Requires: caml_jsstring_of_string
+function caml_binaryen_data_drop_set_segment(expr, segment) {
+  return Binaryen.DataDrop.setSegment(expr, caml_jsstring_of_string(segment));
 }
 
 //Provides: caml_binaryen_memory_copy_get_dest
@@ -1664,10 +1683,10 @@ function caml_binaryen_ref_null(wasm_mod, typ) {
   return wasm_mod.ref.null(typ);
 }
 
-//Provides: caml_binaryen_ref_is
+//Provides: caml_binaryen_ref_is_null
 //Requires: Binaryen
-function caml_binaryen_ref_is(wasm_mod, op, value) {
-  return Binaryen._BinaryenRefIs(wasm_mod, op, value);
+function caml_binaryen_ref_is_null(wasm_mod, value) {
+  return Binaryen.ExpressionIds.RefIsNull(wasm_mod, value);
 }
 
 //Provides: caml_binaryen_ref_as

binaryen-archive/src/expression.ml

@@ -251,9 +251,10 @@ external id_ref_null : unit -> int = "caml_binaryen_expression_id_ref_null"
 
 let id_ref_null = id_ref_null ()
 
-external id_ref_is : unit -> int = "caml_binaryen_expression_id_ref_is"
+external id_ref_is_null : unit -> int
+  = "caml_binaryen_expression_id_ref_is_null"
 
-let id_ref_is = id_ref_is ()
+let id_ref_is_null = id_ref_is_null ()
 
 external id_ref_func : unit -> int = "caml_binaryen_expression_id_ref_func"
 
@@ -385,7 +386,7 @@ let get_kind expr =
   | n when n = id_unreachable -> Unreachable
   | n when n = id_pop -> Pop
   | n when n = id_ref_null -> RefNull
-  | n when n = id_ref_is -> RefIs
+  | n when n = id_ref_is_null -> RefIs
   | n when n = id_ref_func -> RefFunc
   | n when n = id_ref_eq -> RefEq
   | n when n = id_try -> Try
@@ -702,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"
@@ -720,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 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 -> int -> unit
+  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
@@ -799,6 +819,14 @@ module Pop = struct
   (** Module, type *)
 end
 
+module I31 = struct
+  external make : Module.t -> t -> t = "caml_binaryen_i31_new"
+  (** Module, value *)
+
+  external get : Module.t -> t -> bool -> t = "caml_binaryen_i31_get"
+  (** Module, i31, is_signed *)
+end
+
 module Null = struct
   external make : unit -> t = "caml_binaryen_null_expression"
   (** A null reference. *)
@@ -808,8 +836,8 @@ module Ref = struct
   external null : Module.t -> Type.t -> t = "caml_binaryen_ref_null"
   (** Module, type *)
 
-  external is : Module.t -> Op.t -> t -> t = "caml_binaryen_ref_is"
-  (** Module, op, value *)
+  external is_null : Module.t -> t -> t = "caml_binaryen_ref_is_null"
+  (** Module, value *)
 
   external as_ : Module.t -> Op.t -> t -> t = "caml_binaryen_ref_as"
   (** Module, op, value *)

binaryen-archive/src/expression.mli

@@ -321,6 +321,14 @@ module Pop : sig
   val make : Module.t -> Type.t -> t
 end
 
+module I31 : sig
+  val make : Module.t -> t -> t
+  (** Module, value *)
+
+  val get : Module.t -> t -> bool -> t
+  (** Module, i31, is_signed *)
+end
+
 module Null : sig
   val make : unit -> t
 end
@@ -329,8 +337,8 @@ module Ref : sig
   val null : Module.t -> Type.t -> t
   (** Module, type *)
 
-  val is : Module.t -> Op.t -> t -> t
-  (** Module, op, value *)
+  val is_null : Module.t -> t -> t
+  (** Module, value *)
 
   val as_ : Module.t -> Op.t -> t -> t
   (** Module, op, value *)

binaryen-archive/src/heap_type.c

@@ -43,9 +43,9 @@ caml_binaryen_heap_type_i31(value unit) {
 }
 
 CAMLprim value
-caml_binaryen_heap_type_data(value unit) {
+caml_binaryen_heap_type_struct(value unit) {
   CAMLparam1(unit);
-  BinaryenHeapType ty = BinaryenHeapTypeData();
+  BinaryenHeapType ty = BinaryenHeapTypeStruct();
   CAMLreturn(alloc_BinaryenHeapType(ty));
 }
 

binaryen-archive/src/heap_type.js

@@ -28,10 +28,10 @@ function caml_binaryen_heap_type_i31() {
   return Binaryen._BinaryenHeapTypeI31();
 }
 
-//Provides: caml_binaryen_heap_type_data
+//Provides: caml_binaryen_heap_type_struct
 //Requires: Binaryen
-function caml_binaryen_heap_type_data() {
-  return Binaryen._BinaryenHeapTypeData();
+function caml_binaryen_heap_type_struct() {
+  return Binaryen._BinaryenHeapTypeStruct();
 }
 
 //Provides: caml_binaryen_heap_type_array

binaryen-archive/src/heap_type.ml

@@ -5,7 +5,7 @@ external func : unit -> t = "caml_binaryen_heap_type_func"
 external any : unit -> t = "caml_binaryen_heap_type_any"
 external eq : unit -> t = "caml_binaryen_heap_type_eq"
 external i31 : unit -> t = "caml_binaryen_heap_type_i31"
-external data : unit -> t = "caml_binaryen_heap_type_data"
+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"

binaryen-archive/src/heap_type.mli

@@ -5,7 +5,7 @@ val func : unit -> t
 val any : unit -> t
 val eq : unit -> t
 val i31 : unit -> t
-val data : unit -> t
+val struct_ : unit -> t
 val array : unit -> t
 val string : unit -> t
 val stringview_wtf8 : unit -> t

binaryen-archive/src/op.c

@@ -1476,6 +1476,83 @@ caml_binaryen_bitselect_vec128(value unit) {
   CAMLreturn(alloc_BinaryenOp(op));
 }
 
+CAMLprim value
+caml_binaryen_relaxed_fma_vec_f32x4(value unit) {
+  CAMLparam1(unit);
+  BinaryenOp op = BinaryenRelaxedFmaVecF32x4();
+  CAMLreturn(alloc_BinaryenOp(op));
+}
+
+CAMLprim value
+caml_binaryen_relaxed_fms_vec_f32x4(value unit) {
+  CAMLparam1(unit);
+  BinaryenOp op = BinaryenRelaxedFmsVecF32x4();
+  CAMLreturn(alloc_BinaryenOp(op));
+}
+
+CAMLprim value
+caml_binaryen_relaxed_fma_vec_f64x4(value unit) {
+  CAMLparam1(unit);
+  BinaryenOp op = BinaryenRelaxedFmaVecF64x2();
+  CAMLreturn(alloc_BinaryenOp(op));
+}
+
+CAMLprim value
+caml_binaryen_relaxed_fms_vec_f64x4(value unit) {
+  CAMLparam1(unit);
+  BinaryenOp op = BinaryenRelaxedFmsVecF64x2();
+  CAMLreturn(alloc_BinaryenOp(op));
+}
+
+CAMLprim value
+caml_binaryen_laneselect_i8x16(value unit) {
+  CAMLparam1(unit);
+  BinaryenOp op = BinaryenLaneselectI8x16();
+  CAMLreturn(alloc_BinaryenOp(op));
+}
+
+CAMLprim value
+caml_binaryen_laneselect_i16x8(value unit) {
+  CAMLparam1(unit);
+  BinaryenOp op = BinaryenLaneselectI16x8();
+  CAMLreturn(alloc_BinaryenOp(op));
+}
+
+CAMLprim value
+caml_binaryen_laneselect_i32x4(value unit) {
+  CAMLparam1(unit);
+  BinaryenOp op = BinaryenLaneselectI32x4();
+  CAMLreturn(alloc_BinaryenOp(op));
+}
+
+CAMLprim value
+caml_binaryen_laneselect_i64x2(value unit) {
+  CAMLparam1(unit);
+  BinaryenOp op = BinaryenLaneselectI64x2();
+  CAMLreturn(alloc_BinaryenOp(op));
+}
+
+CAMLprim value
+caml_binaryen_dot_i8x16_i7x16_add_s_to_vec_i32x4(value unit) {
+  CAMLparam1(unit);
+  BinaryenOp op = BinaryenDotI8x16I7x16AddSToVecI32x4();
+  CAMLreturn(alloc_BinaryenOp(op));
+}
+
+CAMLprim value
+caml_binaryen_any_true_vec128(value unit) {
+  CAMLparam1(unit);
+  BinaryenOp op = BinaryenAnyTrueVec128();
+  CAMLreturn(alloc_BinaryenOp(op));
+}
+
+CAMLprim value
+caml_binaryen_popcnt_vec_i8x16(value unit) {
+  CAMLparam1(unit);
+  BinaryenOp op = BinaryenPopcntVecI8x16();
+  CAMLreturn(alloc_BinaryenOp(op));
+}
+
 CAMLprim value
 caml_binaryen_abs_vec_i8x16(value unit) {
   CAMLparam1(unit);
@@ -2162,34 +2239,6 @@ caml_binaryen_swizzle_vec8x16(value unit) {
   CAMLreturn(alloc_BinaryenOp(op));
 }
 
-CAMLprim value
-caml_binaryen_ref_is_null(value unit) {
-  CAMLparam1(unit);
-  BinaryenOp op = BinaryenRefIsNull();
-  CAMLreturn(alloc_BinaryenOp(op));
-}
-
-CAMLprim value
-caml_binaryen_ref_is_func(value unit) {
-  CAMLparam1(unit);
-  BinaryenOp op = BinaryenRefIsFunc();
-  CAMLreturn(alloc_BinaryenOp(op));
-}
-
-CAMLprim value
-caml_binaryen_ref_is_data(value unit) {
-  CAMLparam1(unit);
-  BinaryenOp op = BinaryenRefIsData();
-  CAMLreturn(alloc_BinaryenOp(op));
-}
-
-CAMLprim value
-caml_binaryen_ref_is_i31(value unit) {
-  CAMLparam1(unit);
-  BinaryenOp op = BinaryenRefIsI31();
-  CAMLreturn(alloc_BinaryenOp(op));
-}
-
 CAMLprim value
 caml_binaryen_ref_as_non_null(value unit) {
   CAMLparam1(unit);
@@ -2197,27 +2246,6 @@ caml_binaryen_ref_as_non_null(value unit) {
   CAMLreturn(alloc_BinaryenOp(op));
 }
 
-CAMLprim value
-caml_binaryen_ref_as_func(value unit) {
-  CAMLparam1(unit);
-  BinaryenOp op = BinaryenRefAsFunc();
-  CAMLreturn(alloc_BinaryenOp(op));
-}
-
-CAMLprim value
-caml_binaryen_ref_as_data(value unit) {
-  CAMLparam1(unit);
-  BinaryenOp op = BinaryenRefAsData();
-  CAMLreturn(alloc_BinaryenOp(op));
-}
-
-CAMLprim value
-caml_binaryen_ref_as_i31(value unit) {
-  CAMLparam1(unit);
-  BinaryenOp op = BinaryenRefAsI31();
-  CAMLreturn(alloc_BinaryenOp(op));
-}
-
 CAMLprim value
 caml_binaryen_ref_as_extern_internalize(value unit) {
   CAMLparam1(unit);
@@ -2260,48 +2288,6 @@ caml_binaryen_br_on_cast_fail(value unit) {
   CAMLreturn(alloc_BinaryenOp(op));
 }
 
-CAMLprim value
-caml_binaryen_br_on_func(value unit) {
-  CAMLparam1(unit);
-  BinaryenOp op = BinaryenBrOnFunc();
-  CAMLreturn(alloc_BinaryenOp(op));
-}
-
-CAMLprim value
-caml_binaryen_br_on_non_func(value unit) {
-  CAMLparam1(unit);
-  BinaryenOp op = BinaryenBrOnNonFunc();
-  CAMLreturn(alloc_BinaryenOp(op));
-}
-
-CAMLprim value
-caml_binaryen_br_on_data(value unit) {
-  CAMLparam1(unit);
-  BinaryenOp op = BinaryenBrOnData();
-  CAMLreturn(alloc_BinaryenOp(op));
-}
-
-CAMLprim value
-caml_binaryen_br_on_non_data(value unit) {
-  CAMLparam1(unit);
-  BinaryenOp op = BinaryenBrOnNonData();
-  CAMLreturn(alloc_BinaryenOp(op));
-}
-
-CAMLprim value
-caml_binaryen_br_on_i31(value unit) {
-  CAMLparam1(unit);
-  BinaryenOp op = BinaryenBrOnI31();
-  CAMLreturn(alloc_BinaryenOp(op));
-}
-
-CAMLprim value
-caml_binaryen_br_on_non_i31(value unit) {
-  CAMLparam1(unit);
-  BinaryenOp op = BinaryenBrOnNonI31();
-  CAMLreturn(alloc_BinaryenOp(op));
-}
-
 CAMLprim value
 caml_binaryen_string_new_utf8(value unit) {
   CAMLparam1(unit);
@@ -2317,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));
 }
 
@@ -2345,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));
 }
 
@@ -2358,6 +2344,13 @@ caml_binaryen_string_new_wtf16_array(value unit) {
   CAMLreturn(alloc_BinaryenOp(op));
 }
 
+CAMLprim value
+caml_binaryen_string_new_from_code_point(value unit) {
+  CAMLparam1(unit);
+  BinaryenOp op = BinaryenStringNewFromCodePoint();
+  CAMLreturn(alloc_BinaryenOp(op));
+}
+
 CAMLprim value
 caml_binaryen_string_measure_utf8(value unit) {
   CAMLparam1(unit);
@@ -2400,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);
@@ -2421,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);
@@ -2483,3 +2490,17 @@ caml_binaryen_string_slice_wtf16(value unit) {
   BinaryenOp op = BinaryenStringSliceWTF16();
   CAMLreturn(alloc_BinaryenOp(op));
 }
+
+CAMLprim value
+caml_binaryen_string_eq_equal(value unit) {
+  CAMLparam1(unit);
+  BinaryenOp op = BinaryenStringEqEqual();
+  CAMLreturn(alloc_BinaryenOp(op));
+}
+
+CAMLprim value
+caml_binaryen_string_eq_compare(value unit) {
+  CAMLparam1(unit);
+  BinaryenOp op = BinaryenStringEqCompare();
+  CAMLreturn(alloc_BinaryenOp(op));
+}