@grain/binaryen.ml 0.9.0 → 0.11.1

binaryen-archive/src/function.ml

@@ -12,7 +12,25 @@ external set_debug_location : t -> Expression.t -> int -> int -> int -> unit
 
 external get_function : Module.t -> string -> t = "caml_binaryen_get_function"
 
+external get_function_by_index : Module.t -> int -> t
+  = "caml_binaryen_get_function_by_index"
+
 external remove_function : Module.t -> string -> unit
   = "caml_binaryen_remove_function"
 
 external get_num_functions : Module.t -> int = "caml_binaryen_get_num_functions"
+
+external get_name : t -> string = "caml_binaryen_function_get_name"
+
+external get_params : t -> Type.t = "caml_binaryen_function_get_params"
+
+external get_results : t -> Type.t = "caml_binaryen_function_get_results"
+
+external get_num_vars : t -> int = "caml_binaryen_function_get_num_vars"
+
+external get_var : t -> int -> Type.t = "caml_binaryen_function_get_var"
+
+external get_body : t -> Expression.t = "caml_binaryen_function_get_body"
+
+external set_body : t -> Expression.t -> unit
+  = "caml_binaryen_function_set_body"

binaryen-archive/src/global.ml

@@ -8,3 +8,17 @@ external get_global : Module.t -> string -> t = "caml_binaryen_get_global"
 
 external remove_global : Module.t -> string -> unit
   = "caml_binaryen_remove_global"
+
+external get_num_globals : Module.t -> int = "caml_binaryen_get_num_globals"
+
+external get_global_by_index : Module.t -> int -> t
+  = "caml_binaryen_get_global_by_index"
+
+external get_name : t -> string = "caml_binaryen_global_get_name"
+
+external get_type : t -> Type.t = "caml_binaryen_global_get_type"
+
+external is_mutable : t -> bool = "caml_binaryen_global_is_mutable"
+
+external get_init_expr : t -> Expression.t
+  = "caml_binaryen_global_get_init_expr"

binaryen-archive/src/import.ml

@@ -16,3 +16,15 @@ external add_global_import :
   Module.t -> string -> string -> string -> Type.t -> bool -> unit
   = "caml_binaryen_add_global_import__bytecode" "caml_binaryen_add_global_import"
 (** Module, internal name, external module name, external base name, type, mutable. *)
+
+external function_import_get_module : Function.t -> string
+  = "caml_binaryen_function_import_get_module"
+
+external global_import_get_module : Global.t -> string
+  = "caml_binaryen_global_import_get_module"
+
+external function_import_get_base : Function.t -> string
+  = "caml_binaryen_function_import_get_base"
+
+external global_import_get_base : Global.t -> string
+  = "caml_binaryen_global_import_get_base"

binaryen-archive/src/literal.ml

@@ -15,9 +15,9 @@ external float64 : float -> t = "caml_binaryen_literal_float64"
 (* Hacks for Binaryen.js stack allocations, Don't use in binaryen.native *)
 type jsoo =
   | Int32 of int32
-  | Int64 of int64
+  | Int64 of int32 * int32
   | Float32Bits of int32
-  | Float64Bits of int64
+  | Float64Bits of int32 * int32
   | Float32 of float
   | Float64 of float
 

binaryen-archive/src/module.ml

@@ -4,69 +4,95 @@ let _ = Callback.register "array_length" Array.length
 
 type t
 
-external create : unit -> t = "caml_binaryen_module_create"
+module Feature = struct
+  type t = int
 
-external dispose : t -> unit = "caml_binaryen_module_dispose"
+  external mvp : unit -> t = "caml_binaryen_feature_mvp"
 
-external add_custom_section : t -> string -> string -> unit
-  = "caml_binaryen_add_custom_section"
+  let mvp = mvp ()
 
-external parse : string -> t = "caml_binaryen_module_parse"
+  external atomics : unit -> t = "caml_binaryen_feature_atomics"
 
-external print : t -> unit = "caml_binaryen_module_print"
+  let atomics = atomics ()
 
-external print_asmjs : t -> unit = "caml_binaryen_module_print_asmjs"
+  external bulk_memory : unit -> t = "caml_binaryen_feature_bulk_memory"
 
-external validate : t -> int = "caml_binaryen_module_validate"
+  let bulk_memory = bulk_memory ()
 
-external optimize : t -> unit = "caml_binaryen_module_optimize"
+  external mutable_globals : unit -> t = "caml_binaryen_feature_mutable_globals"
 
-external set_features : t -> int -> unit = "caml_binaryen_module_set_features"
+  let mutable_globals = mutable_globals ()
 
-let set_features wasm_mod features =
-  set_features wasm_mod (List.fold_left ( lor ) 0 features)
+  external nontrapping_fp_to_int : unit -> t
+    = "caml_binaryen_feature_nontrapping_fp_to_int"
 
-external get_optimize_level : unit -> int = "caml_binaryen_get_optimize_level"
+  let nontrapping_fp_to_int = nontrapping_fp_to_int ()
 
-external set_optimize_level : int -> unit = "caml_binaryen_set_optimize_level"
+  external sign_ext : unit -> t = "caml_binaryen_feature_sign_ext"
 
-external get_shrink_level : unit -> int = "caml_binaryen_get_shrink_level"
+  let sign_ext = sign_ext ()
 
-external set_shrink_level : int -> unit = "caml_binaryen_set_shrink_level"
+  external simd128 : unit -> t = "caml_binaryen_feature_simd128"
 
-external get_debug_info : unit -> int = "caml_binaryen_get_debug_info"
+  let simd128 = simd128 ()
 
-external set_debug_info : int -> unit = "caml_binaryen_set_debug_info"
+  external exception_handling : unit -> t
+    = "caml_binaryen_feature_exception_handling"
 
-external get_low_memory_unused : unit -> int
-  = "caml_binaryen_get_low_memory_unused"
+  let exception_handling = exception_handling ()
 
-external set_low_memory_unused : int -> unit
-  = "caml_binaryen_set_low_memory_unused"
+  external tail_call : unit -> t = "caml_binaryen_feature_tail_call"
 
-external get_pass_argument : string -> string
-  = "caml_binaryen_get_pass_argument"
+  let tail_call = tail_call ()
 
-external set_pass_argument : string -> string -> unit
-  = "caml_binaryen_set_pass_argument"
+  external reference_types : unit -> t = "caml_binaryen_feature_reference_types"
 
-external get_always_inline_max_size : unit -> int
-  = "caml_binaryen_get_always_inline_max_size"
+  let reference_types = reference_types ()
 
-external set_always_inline_max_size : int -> unit
-  = "caml_binaryen_set_always_inline_max_size"
+  external multivalue : unit -> t = "caml_binaryen_feature_multivalue"
 
-external get_flexible_inline_max_size : unit -> int
-  = "caml_binaryen_get_flexible_inline_max_size"
+  let multivalue = multivalue ()
 
-external set_flexible_inline_max_size : int -> unit
-  = "caml_binaryen_set_flexible_inline_max_size"
+  external all : unit -> t = "caml_binaryen_feature_all"
 
-external get_one_caller_inline_max_size : unit -> int
-  = "caml_binaryen_get_one_caller_inline_max_size"
+  let all = all ()
+end
+
+external create : unit -> t = "caml_binaryen_module_create"
 
-external set_one_caller_inline_max_size : int -> unit
-  = "caml_binaryen_set_one_caller_inline_max_size"
+external dispose : t -> unit = "caml_binaryen_module_dispose"
+
+external add_custom_section : t -> string -> string -> unit
+  = "caml_binaryen_add_custom_section"
+
+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 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"
+
+let get_features wasm_mod =
+  let features_int = get_features wasm_mod in
+  let rec split_features = function
+    | 0 -> []
+    | feature when features_int land feature > 0 ->
+        feature :: split_features (feature lsr 1)
+    | feature -> split_features (feature lsr 1)
+  in
+  (* Support 32-bit OCaml where integers are 31 bits *)
+  (* This supports up to 31 Binaryen features *)
+  split_features 0x40000000
+
+external set_features : t -> int -> unit = "caml_binaryen_module_set_features"
+
+let set_features wasm_mod features =
+  set_features wasm_mod (List.fold_left ( lor ) 0 features)
 
 external run_passes : t -> string list -> unit
   = "caml_binaryen_module_run_passes"

binaryen-archive/src/ocaml_helpers.c

@@ -7,14 +7,6 @@
 #include "ocaml_helpers.h"
 
 
-CAMLprim value
-caml_alloc_some(value v) {
-  CAMLparam1(v);
-  value some = caml_alloc_small(1, 0);
-  Store_field(some, 0, v);
-  CAMLreturn(some);
-}
-
 CAMLprim value
 array_of_list(value list) {
   CAMLparam1(list);

binaryen-archive/src/ocaml_helpers.h

@@ -29,6 +29,8 @@ static struct custom_operations binaryen_ops = {
 #define BinaryenFunctionRef_val(v) (*((BinaryenFunctionRef*) Data_custom_val(v)))
 #define BinaryenGlobalRef_val(v) (*((BinaryenGlobalRef*) Data_custom_val(v)))
 #define BinaryenExportRef_val(v) (*((BinaryenExportRef*) Data_custom_val(v)))
+#define BinaryenTableRef_val(v) (*((BinaryenTableRef*) Data_custom_val(v)))
+#define BinaryenElementSegmentRef_val(v) (*((BinaryenElementSegmentRef*) Data_custom_val(v)))
 
 #define Val_none Val_int(0)
 #define Some_val(v) Field(v, 0)
@@ -38,9 +40,6 @@ static struct custom_operations binaryen_ops = {
 
 #define Safe_String_val(v) ((char *)memcpy(malloc(caml_string_length(v) + 1), String_val(v), caml_string_length(v) + 1))
 
-CAMLprim value
-caml_alloc_some(value v);
-
 CAMLprim value
 array_of_list(value list);
 

binaryen-archive/src/op.ml

@@ -896,11 +896,6 @@ external neg_vec_i8x16 : unit -> t = "caml_binaryen_binaryen_neg_vec_i8x16"
 
 let neg_vec_i8x16 = neg_vec_i8x16 ()
 
-external any_true_vec_i8x16 : unit -> t
-  = "caml_binaryen_binaryen_any_true_vec_i8x16"
-
-let any_true_vec_i8x16 = any_true_vec_i8x16 ()
-
 external all_true_vec_i8x16 : unit -> t
   = "caml_binaryen_binaryen_all_true_vec_i8x16"
 
@@ -951,10 +946,6 @@ external sub_sat_u_vec_i8x16 : unit -> t
 
 let sub_sat_u_vec_i8x16 = sub_sat_u_vec_i8x16 ()
 
-external mul_vec_i8x16 : unit -> t = "caml_binaryen_binaryen_mul_vec_i8x16"
-
-let mul_vec_i8x16 = mul_vec_i8x16 ()
-
 external min_s_vec_i8x16 : unit -> t = "caml_binaryen_binaryen_min_s_vec_i8x16"
 
 let min_s_vec_i8x16 = min_s_vec_i8x16 ()
@@ -984,11 +975,6 @@ external neg_vec_i16x8 : unit -> t = "caml_binaryen_binaryen_neg_vec_i16x8"
 
 let neg_vec_i16x8 = neg_vec_i16x8 ()
 
-external any_true_vec_i16x8 : unit -> t
-  = "caml_binaryen_binaryen_any_true_vec_i16x8"
-
-let any_true_vec_i16x8 = any_true_vec_i16x8 ()
-
 external all_true_vec_i16x8 : unit -> t
   = "caml_binaryen_binaryen_all_true_vec_i16x8"
 
@@ -1072,11 +1058,6 @@ external neg_vec_i32x4 : unit -> t = "caml_binaryen_binaryen_neg_vec_i32x4"
 
 let neg_vec_i32x4 = neg_vec_i32x4 ()
 
-external any_true_vec_i32x4 : unit -> t
-  = "caml_binaryen_binaryen_any_true_vec_i32x4"
-
-let any_true_vec_i32x4 = any_true_vec_i32x4 ()
-
 external all_true_vec_i32x4 : unit -> t
   = "caml_binaryen_binaryen_all_true_vec_i32x4"
 
@@ -1172,14 +1153,6 @@ external sqrt_vec_f32x4 : unit -> t = "caml_binaryen_binaryen_sqrt_vec_f32x4"
 
 let sqrt_vec_f32x4 = sqrt_vec_f32x4 ()
 
-external qfma_vec_f32x4 : unit -> t = "caml_binaryen_binaryen_qfma_vec_f32x4"
-
-let qfma_vec_f32x4 = qfma_vec_f32x4 ()
-
-external qfms_vec_f32x4 : unit -> t = "caml_binaryen_binaryen_qfms_vec_f32x4"
-
-let qfms_vec_f32x4 = qfms_vec_f32x4 ()
-
 external add_vec_f32x4 : unit -> t = "caml_binaryen_binaryen_add_vec_f32x4"
 
 let add_vec_f32x4 = add_vec_f32x4 ()
@@ -1241,14 +1214,6 @@ external sqrt_vec_f64x2 : unit -> t = "caml_binaryen_binaryen_sqrt_vec_f64x2"
 
 let sqrt_vec_f64x2 = sqrt_vec_f64x2 ()
 
-external qfma_vec_f64x2 : unit -> t = "caml_binaryen_binaryen_qfma_vec_f64x2"
-
-let qfma_vec_f64x2 = qfma_vec_f64x2 ()
-
-external qfms_vec_f64x2 : unit -> t = "caml_binaryen_binaryen_qfms_vec_f64x2"
-
-let qfms_vec_f64x2 = qfms_vec_f64x2 ()
-
 external add_vec_f64x2 : unit -> t = "caml_binaryen_binaryen_add_vec_f64x2"
 
 let add_vec_f64x2 = add_vec_f64x2 ()
@@ -1308,16 +1273,6 @@ external trunc_sat_u_vec_f32x4_to_vec_i32x4 : unit -> t
 
 let trunc_sat_u_vec_f32x4_to_vec_i32x4 = trunc_sat_u_vec_f32x4_to_vec_i32x4 ()
 
-external trunc_sat_s_vec_f64x2_to_vec_i64x2 : unit -> t
-  = "caml_binaryen_binaryen_trunc_sat_s_vec_f64x2_to_vec_i64x2"
-
-let trunc_sat_s_vec_f64x2_to_vec_i64x2 = trunc_sat_s_vec_f64x2_to_vec_i64x2 ()
-
-external trunc_sat_u_vec_f64x2_to_vec_i64x2 : unit -> t
-  = "caml_binaryen_binaryen_trunc_sat_u_vec_f64x2_to_vec_i64x2"
-
-let trunc_sat_u_vec_f64x2_to_vec_i64x2 = trunc_sat_u_vec_f64x2_to_vec_i64x2 ()
-
 external convert_s_vec_i32x4_to_vec_f32x4 : unit -> t
   = "caml_binaryen_binaryen_convert_s_vec_i32x4_to_vec_f32x4"
 
@@ -1328,66 +1283,6 @@ external convert_u_vec_i32x4_to_vec_f32x4 : unit -> t
 
 let convert_u_vec_i32x4_to_vec_f32x4 = convert_u_vec_i32x4_to_vec_f32x4 ()
 
-external convert_s_vec_i64x2_to_vec_f64x2 : unit -> t
-  = "caml_binaryen_binaryen_convert_s_vec_i64x2_to_vec_f64x2"
-
-let convert_s_vec_i64x2_to_vec_f64x2 = convert_s_vec_i64x2_to_vec_f64x2 ()
-
-external convert_u_vec_i64x2_to_vec_f64x2 : unit -> t
-  = "caml_binaryen_binaryen_convert_u_vec_i64x2_to_vec_f64x2"
-
-let convert_u_vec_i64x2_to_vec_f64x2 = convert_u_vec_i64x2_to_vec_f64x2 ()
-
-external load_splat_vec8x16 : unit -> t
-  = "caml_binaryen_binaryen_load_splat_vec8x16"
-
-let load_splat_vec8x16 = load_splat_vec8x16 ()
-
-external load_splat_vec16x8 : unit -> t
-  = "caml_binaryen_binaryen_load_splat_vec16x8"
-
-let load_splat_vec16x8 = load_splat_vec16x8 ()
-
-external load_splat_vec32x4 : unit -> t
-  = "caml_binaryen_binaryen_load_splat_vec32x4"
-
-let load_splat_vec32x4 = load_splat_vec32x4 ()
-
-external load_splat_vec64x2 : unit -> t
-  = "caml_binaryen_binaryen_load_splat_vec64x2"
-
-let load_splat_vec64x2 = load_splat_vec64x2 ()
-
-external load_ext_s_vec8x8_to_vec_i16x8 : unit -> t
-  = "caml_binaryen_binaryen_load_ext_s_vec8x8_to_vec_i16x8"
-
-let load_ext_s_vec8x8_to_vec_i16x8 = load_ext_s_vec8x8_to_vec_i16x8 ()
-
-external load_ext_u_vec8x8_to_vec_i16x8 : unit -> t
-  = "caml_binaryen_binaryen_load_ext_u_vec8x8_to_vec_i16x8"
-
-let load_ext_u_vec8x8_to_vec_i16x8 = load_ext_u_vec8x8_to_vec_i16x8 ()
-
-external load_ext_s_vec16x4_to_vec_i32x4 : unit -> t
-  = "caml_binaryen_binaryen_load_ext_s_vec16x4_to_vec_i32x4"
-
-let load_ext_s_vec16x4_to_vec_i32x4 = load_ext_s_vec16x4_to_vec_i32x4 ()
-
-external load_ext_u_vec16x4_to_vec_i32x4 : unit -> t
-  = "caml_binaryen_binaryen_load_ext_u_vec16x4_to_vec_i32x4"
-
-let load_ext_u_vec16x4_to_vec_i32x4 = load_ext_u_vec16x4_to_vec_i32x4 ()
-
-external load_ext_s_vec32x2_to_vec_i64x2 : unit -> t
-  = "caml_binaryen_binaryen_load_ext_s_vec32x2_to_vec_i64x2"
-
-let load_ext_s_vec32x2_to_vec_i64x2 = load_ext_s_vec32x2_to_vec_i64x2 ()
-
-external load_ext_u_vec32x2_to_vec_i64x2 : unit -> t
-  = "caml_binaryen_binaryen_load_ext_u_vec32x2_to_vec_i64x2"
-
-let load_ext_u_vec32x2_to_vec_i64x2 = load_ext_u_vec32x2_to_vec_i64x2 ()
-
 external narrow_s_vec_i16x8_to_vec_i8x16 : unit -> t
   = "caml_binaryen_binaryen_narrow_s_vec_i16x8_to_vec_i8x16"
 
@@ -1408,46 +1303,38 @@ external narrow_u_vec_i32x4_to_vec_i16x8 : unit -> t
 
 let narrow_u_vec_i32x4_to_vec_i16x8 = narrow_u_vec_i32x4_to_vec_i16x8 ()
 
-external widen_low_s_vec_i8x16_to_vec_i16x8 : unit -> t
-  = "caml_binaryen_binaryen_widen_low_s_vec_i8x16_to_vec_i16x8"
+external swizzle_vec8x16 : unit -> t = "caml_binaryen_binaryen_swizzle_vec8x16"
 
-let widen_low_s_vec_i8x16_to_vec_i16x8 = widen_low_s_vec_i8x16_to_vec_i16x8 ()
+let swizzle_vec8x16 = swizzle_vec8x16 ()
 
-external widen_high_s_vec_i8x16_to_vec_i16x8 : unit -> t
-  = "caml_binaryen_binaryen_widen_high_s_vec_i8x16_to_vec_i16x8"
+external ref_is_null : unit -> t = "caml_binaryen_binaryen_ref_is_null"
 
-let widen_high_s_vec_i8x16_to_vec_i16x8 = widen_high_s_vec_i8x16_to_vec_i16x8 ()
+let ref_is_null = ref_is_null ()
 
-external widen_low_u_vec_i8x16_to_vec_i16x8 : unit -> t
-  = "caml_binaryen_binaryen_widen_low_u_vec_i8x16_to_vec_i16x8"
+external ref_is_func : unit -> t = "caml_binaryen_binaryen_ref_is_func"
 
-let widen_low_u_vec_i8x16_to_vec_i16x8 = widen_low_u_vec_i8x16_to_vec_i16x8 ()
+let ref_is_func = ref_is_func ()
 
-external widen_high_u_vec_i8x16_to_vec_i16x8 : unit -> t
-  = "caml_binaryen_binaryen_widen_high_u_vec_i8x16_to_vec_i16x8"
+external ref_is_data : unit -> t = "caml_binaryen_binaryen_ref_is_data"
 
-let widen_high_u_vec_i8x16_to_vec_i16x8 = widen_high_u_vec_i8x16_to_vec_i16x8 ()
+let ref_is_data = ref_is_data ()
 
-external widen_low_s_vec_i16x8_to_vec_i32x4 : unit -> t
-  = "caml_binaryen_binaryen_widen_low_s_vec_i16x8_to_vec_i32x4"
+external ref_is_i31 : unit -> t = "caml_binaryen_binaryen_ref_is_i31"
 
-let widen_low_s_vec_i16x8_to_vec_i32x4 = widen_low_s_vec_i16x8_to_vec_i32x4 ()
+let ref_is_i31 = ref_is_i31 ()
 
-external widen_high_s_vec_i16x8_to_vec_i32x4 : unit -> t
-  = "caml_binaryen_binaryen_widen_high_s_vec_i16x8_to_vec_i32x4"
+external ref_as_non_null : unit -> t = "caml_binaryen_binaryen_ref_as_non_null"
 
-let widen_high_s_vec_i16x8_to_vec_i32x4 = widen_high_s_vec_i16x8_to_vec_i32x4 ()
+let ref_as_non_null = ref_as_non_null ()
 
-external widen_low_u_vec_i16x8_to_vec_i32x4 : unit -> t
-  = "caml_binaryen_binaryen_widen_low_u_vec_i16x8_to_vec_i32x4"
+external ref_as_func : unit -> t = "caml_binaryen_binaryen_ref_as_func"
 
-let widen_low_u_vec_i16x8_to_vec_i32x4 = widen_low_u_vec_i16x8_to_vec_i32x4 ()
+let ref_as_func = ref_as_func ()
 
-external widen_high_u_vec_i16x8_to_vec_i32x4 : unit -> t
-  = "caml_binaryen_binaryen_widen_high_u_vec_i16x8_to_vec_i32x4"
+external ref_as_data : unit -> t = "caml_binaryen_binaryen_ref_as_data"
 
-let widen_high_u_vec_i16x8_to_vec_i32x4 = widen_high_u_vec_i16x8_to_vec_i32x4 ()
+let ref_as_data = ref_as_data ()
 
-external swizzle_vec8x16 : unit -> t = "caml_binaryen_binaryen_swizzle_vec8x16"
+external ref_as_i31 : unit -> t = "caml_binaryen_binaryen_ref_as_i31"
 
-let swizzle_vec8x16 = swizzle_vec8x16 ()
+let ref_as_i31 = ref_as_i31 ()

binaryen-archive/src/settings.ml

@@ -0,0 +1,45 @@
+external get_optimize_level : unit -> int = "caml_binaryen_get_optimize_level"
+
+external set_optimize_level : int -> unit = "caml_binaryen_set_optimize_level"
+
+external get_shrink_level : unit -> int = "caml_binaryen_get_shrink_level"
+
+external set_shrink_level : int -> unit = "caml_binaryen_set_shrink_level"
+
+external get_debug_info : unit -> bool = "caml_binaryen_get_debug_info"
+
+external set_debug_info : bool -> unit = "caml_binaryen_set_debug_info"
+
+external get_low_memory_unused : unit -> bool
+  = "caml_binaryen_get_low_memory_unused"
+
+external set_low_memory_unused : bool -> unit
+  = "caml_binaryen_set_low_memory_unused"
+
+external get_pass_argument : string -> string
+  = "caml_binaryen_get_pass_argument"
+
+external set_pass_argument : string -> string -> unit
+  = "caml_binaryen_set_pass_argument"
+
+external get_always_inline_max_size : unit -> int
+  = "caml_binaryen_get_always_inline_max_size"
+
+external set_always_inline_max_size : int -> unit
+  = "caml_binaryen_set_always_inline_max_size"
+
+external get_flexible_inline_max_size : unit -> int
+  = "caml_binaryen_get_flexible_inline_max_size"
+
+external set_flexible_inline_max_size : int -> unit
+  = "caml_binaryen_set_flexible_inline_max_size"
+
+external get_one_caller_inline_max_size : unit -> int
+  = "caml_binaryen_get_one_caller_inline_max_size"
+
+external set_one_caller_inline_max_size : int -> unit
+  = "caml_binaryen_set_one_caller_inline_max_size"
+
+external set_colors_enabled : bool -> unit = "caml_binaryen_set_colors_enabled"
+
+external are_colors_enabled : unit -> bool = "caml_binaryen_are_colors_enabled"

binaryen-archive/src/table.ml

@@ -1,4 +1,26 @@
-external add_table :
-  Module.t -> string -> int -> int -> string list -> Expression.t -> unit
-  = "caml_binaryen_add_table__bytecode" "caml_binaryen_add_table"
-(** Module, name, initial size, maximum size, function names, offset. *)
+type t
+
+external add_table : Module.t -> string -> int -> int -> t
+  = "caml_binaryen_add_table"
+(** Module, name, initial size, maximum size. *)
+
+external add_active_element_segment :
+  Module.t ->
+  string ->
+  string ->
+  string list ->
+  Expression.t ->
+  Element_segment.t = "caml_binaryen_add_active_element_segment"
+(** Module, table, name, function names, offset. *)
+
+external remove_element_segment : Module.t -> string -> unit
+  = "caml_binaryen_remove_element_segment"
+
+external get_num_element_segments : Module.t -> int
+  = "caml_binaryen_get_num_element_segments"
+
+external get_element_segment : Module.t -> string -> Element_segment.t
+  = "caml_binaryen_get_element_segment"
+
+external get_element_segment_by_index : Module.t -> int -> Element_segment.t
+  = "caml_binaryen_get_element_segment_by_index"

binaryen-archive/src/type.ml

@@ -41,3 +41,5 @@ external auto : unit -> t = "caml_binaryen_type_auto"
 let auto = auto ()
 
 external create : t array -> t = "caml_binaryen_type_create"
+
+external expand : t -> t array = "caml_binaryen_type_expand"

binaryen-archive/test/config/dune

@@ -0,0 +1,8 @@
+(executable
+ (name ocamlopt_flags)
+ (libraries dune.configurator))
+
+(rule
+ (targets ocamlopt_flags.sexp)
+ (action
+  (run ./ocamlopt_flags.exe)))

binaryen-archive/test/config/ocamlopt_flags.ml

@@ -0,0 +1,16 @@
+module C = Configurator.V1
+
+let () =
+  C.main ~name:"ocamlopt_flags" (fun c ->
+      let default = [] in
+
+      let ocamlopt_flags =
+        match C.ocaml_config_var c "system" with
+        | Some "macosx" ->
+            (* These flags preserve the original C++ error behavior. Ref https://github.com/ocaml/ocaml/issues/10423 *)
+            [ "-cc"; "clang++" ]
+        | Some _ -> default
+        | None -> default
+      in
+
+      C.Flags.write_sexp "ocamlopt_flags.sexp" ocamlopt_flags)

binaryen-archive/test/dune

@@ -4,6 +4,8 @@
  (name test)
  (modules test)
  (libraries binaryen)
+ (ocamlopt_flags
+  (:include ./config/ocamlopt_flags.sexp))
  (action
   (run %{test})))
 
@@ -20,6 +22,8 @@
  (name test_native)
  (modules test_native)
  (libraries binaryen binaryen.native)
+ (ocamlopt_flags
+  (:include ./config/ocamlopt_flags.sexp))
  (action
   (run %{test})))