@grain/binaryen.ml 0.34.0 → 0.36.0

binaryen-archive/src/expression.mli

@@ -161,6 +161,21 @@ module Call_indirect : sig
   val set_return : t -> bool -> unit
 end
 
+module Call_ref : sig
+  val make : Module.t -> t -> t list -> Type.t -> t
+  val make_return : Module.t -> t -> t list -> Type.t -> t
+  val get_target : t -> t
+  val set_target : t -> t -> unit
+  val get_num_operands : t -> int
+  val get_operand_at : t -> int -> t
+  val set_operand_at : t -> int -> t -> unit
+  val append_operand : t -> t -> int
+  val insert_operand_at : t -> int -> t -> unit
+  val remove_operand_at : t -> int -> t
+  val is_return : t -> bool
+  val set_return : t -> bool -> unit
+end
+
 module Local_get : sig
   val make : Module.t -> int -> Type.t -> t
 end
@@ -348,6 +363,150 @@ module Ref : sig
 
   val eq : Module.t -> t -> t -> t
   (** Module, left, right *)
+
+  val test : Module.t -> t -> Type.t -> t
+  (** Module, value, type *)
+
+  val cast : Module.t -> t -> Type.t -> t
+  (** Module, value, type *)
+end
+
+module BrOn : sig
+  val make : Module.t -> Op.t -> string -> t -> Type.t -> t
+  (** Module, op, label, value, type *)
+end
+
+module Struct : sig
+  val new_ : Module.t -> t list option -> Heap_type.t -> t
+  (** Mdoule, operands, type *)
+
+  val get : Module.t -> int -> t -> Type.t -> bool -> t
+  (** Module, index, struct, type, signed *)
+
+  val set : Module.t -> int -> t -> t -> t
+  (** Module, index, struct, value *)
+end
+
+module Array : sig
+  val new_ : Module.t -> Heap_type.t -> t -> t -> t
+  (** Module, type, size, init *)
+
+  val new_data : Module.t -> Heap_type.t -> string -> t -> t -> t
+  (** Module, type, data name, offset, size *)
+
+  val new_elem : Module.t -> Heap_type.t -> string -> t -> t -> t
+  (** Module, type, seg, offset, size *)
+
+  val new_fixed : Module.t -> Heap_type.t -> t list -> t
+  (** Module, type, values *)
+
+  val get : Module.t -> t -> t -> Type.t -> bool -> t
+  (** Module, array, index, type, signed *)
+
+  val set : Module.t -> t -> t -> t -> t
+  (** Module, array, index, value *)
+
+  val len : Module.t -> t -> t
+  (** Module, array *)
+
+  val fill : Module.t -> t -> t -> t -> t -> t
+  (** Module, array, index, value, offset *)
+
+  val copy : Module.t -> t -> t -> t -> t -> t -> t
+  (** Module, dest, dest index, src, src index, length *)
+
+  val init_data : Module.t -> string -> t -> t -> t -> t -> t
+  (** Module, name, ref, index, offset, size *)
+
+  val init_elem : Module.t -> string -> t -> t -> t -> t -> t
+  (** Module, seg, ref, index, offset, size *)
+end
+
+(** Bindings for `try` instruction. *)
+module Try : sig
+  val make :
+    Module.t -> string option -> t -> (string * t) list -> t option -> t
+  (** Module, name, body, catch clauses, catch all *)
+
+  val get_name : t -> string option
+  (** expr *)
+
+  val set_name : t -> string -> unit
+  (** expr, name *)
+
+  val get_body : t -> t
+  (** expr *)
+
+  val set_body : t -> t -> unit
+  (** expr, bodyExpr *)
+
+  val get_num_catch_tags : t -> int
+  (** expr *)
+
+  val get_num_catch_bodies : t -> int
+  (** expr *)
+
+  val get_catch_tag_at : t -> int -> string
+  (** expr, index *)
+
+  val set_catch_tag_at : t -> int -> string -> unit
+  (** expr, index, catchTag *)
+
+  val append_catch_tag : t -> string -> int
+  (** expr, catchTag *)
+
+  val insert_catch_tag_at : t -> int -> string -> unit
+  (** expr, index, catchTag *)
+
+  val remove_catch_tag_at : t -> int -> string
+  (** expr, index *)
+
+  val get_catch_body_at : t -> int -> t
+  (** expr, index *)
+
+  val set_catch_body_at : t -> int -> t -> unit
+  (** expr, index, catchExpr *)
+
+  val append_catch_body : t -> t -> int
+  (** expr, catchExpr *)
+
+  val insert_catch_body_at : t -> int -> t -> unit
+  (** expr, index, catchExpr *)
+
+  val remove_catch_body_at : t -> int -> t
+  (** expr, index *)
+
+  val has_catch_all : t -> bool
+  (** expr *)
+end
+
+module Throw : sig
+  val make : Module.t -> string -> t list -> t
+  (** Module, tag, operands *)
+
+  val get_tag : t -> string
+  (** expr *)
+
+  val set_tag : t -> string -> unit
+  (** expr, tagName *)
+
+  val get_num_operands : t -> int
+  (** expr *)
+
+  val get_operand_at : t -> int -> t
+  (** expr, index *)
+
+  val set_operand_at : t -> int -> t -> unit
+  (** expr, index, operandExpr *)
+
+  val append_operand : t -> t -> int
+  (** expr, operandExpr *)
+
+  val insert_operand_at : t -> int -> t -> unit
+  (** expr, index, operandExpr *)
+
+  val remove_operand_at : t -> int -> t
+  (** expr, index *)
 end
 
 module Table : sig

binaryen-archive/src/heap_type.c

@@ -148,3 +148,22 @@ caml_binaryen_type_get_heap_type(value _ty) {
   BinaryenHeapType heapTy = BinaryenTypeGetHeapType(ty);
   CAMLreturn(alloc_BinaryenHeapType(heapTy));
 }
+
+CAMLprim value caml_binaryen_module_set_type_name(value _module, value _heapType, value _name) {
+  CAMLparam3(_module, _heapType, _name);
+  BinaryenModuleRef module = BinaryenModuleRef_val(_module);
+  BinaryenHeapType heapType = BinaryenHeapType_val(_heapType);
+  const char* name = String_val(_name);
+  BinaryenModuleSetTypeName(module, heapType, name);
+  CAMLreturn(Val_unit);
+}
+
+CAMLprim value caml_binaryen_module_set_field_name(value _module, value _heapType, value _index, value _name) {
+  CAMLparam4(_module, _heapType, _index, _name);
+  BinaryenModuleRef module = BinaryenModuleRef_val(_module);
+  BinaryenHeapType heapType = BinaryenHeapType_val(_heapType);
+  BinaryenIndex index = Int_val(_index);
+  const char* name = String_val(_name);
+  BinaryenModuleSetFieldName(module, heapType, index, name);
+  CAMLreturn(Val_unit);
+}

binaryen-archive/src/heap_type.js

@@ -111,3 +111,15 @@ function caml_binaryen_heap_type_is_sub_type(left, right) {
 function caml_binaryen_type_get_heap_type(typ) {
   return Binaryen._BinaryenTypeGetHeapType(typ);
 }
+
+//Provides: caml_binaryen_module_set_type_name
+//Requires: caml_jsstring_of_string
+function caml_binaryen_module_set_type_name(wasm_mod, heapType, name) {
+  wasm_mod.setTypeName(heapType, caml_jsstring_of_string(name));
+}
+
+//Provides: caml_binaryen_module_set_field_name
+//Requires: caml_jsstring_of_string
+function caml_binaryen_module_set_field_name(wasm_mod, heapType, index, name) {
+  wasm_mod.setFieldName(heapType, index, caml_jsstring_of_string(name));
+}

binaryen-archive/src/heap_type.ml

@@ -17,4 +17,13 @@ external is_struct : t -> bool = "caml_binaryen_heap_type_is_struct"
 external is_array : t -> bool = "caml_binaryen_heap_type_is_array"
 external is_bottom : t -> bool = "caml_binaryen_heap_type_is_bottom"
 external get_bottom : t -> t = "caml_binaryen_heap_type_get_bottom"
-external is_sub_type : t -> bool = "caml_binaryen_heap_type_is_sub_type"
+external is_sub_type : t -> t -> bool = "caml_binaryen_heap_type_is_sub_type"
+
+external set_type_name : Module.t -> t -> string -> unit
+  = "caml_binaryen_module_set_type_name"
+(** Sets the textual name of a compound `heapType`. Has no effect if the type
+    already has a canonical name. *)
+
+external set_field_name : Module.t -> t -> int -> string -> unit
+  = "caml_binaryen_module_set_field_name"
+(** Sets the field name of a struct `heapType` at index `index`. *)

binaryen-archive/src/heap_type.mli

@@ -17,4 +17,11 @@ val is_struct : t -> bool
 val is_array : t -> bool
 val is_bottom : t -> bool
 val get_bottom : t -> t
-val is_sub_type : t -> bool
+val is_sub_type : t -> t -> bool
+
+val set_type_name : Module.t -> t -> string -> unit
+(** Sets the textual name of a compound `heapType`. Has no effect if the type
+    already has a canonical name. *)
+
+val set_field_name : Module.t -> t -> int -> string -> unit
+(** Sets the field name of a struct `heapType` at index `index`. *)

binaryen-archive/src/import.c

@@ -67,6 +67,24 @@ caml_binaryen_add_global_import__bytecode(value * argv) {
   return caml_binaryen_add_global_import(argv[0], argv[1], argv[2], argv[3], argv[4], argv[5]);
 }
 
+CAMLprim value
+caml_binaryen_add_tag_import(value _module, value _internalName, value _externalModuleName, value _externalBaseName, value _paramsty, value _resultsty) {
+  CAMLparam5(_module, _internalName, _externalModuleName, _externalBaseName, _paramsty);
+  CAMLxparam1(_resultsty);
+  BinaryenModuleRef module = BinaryenModuleRef_val(_module);
+  char* internalName = Safe_String_val(_internalName);
+  char* externalModuleName = Safe_String_val(_externalModuleName);
+  char* externalBaseName = Safe_String_val(_externalBaseName);
+  BinaryenType paramsty = BinaryenType_val(_paramsty);
+  BinaryenType resultsty = BinaryenType_val(_resultsty);
+  BinaryenAddTagImport(module, internalName, externalModuleName, externalBaseName, paramsty, resultsty);
+  CAMLreturn(Val_unit);
+}
+CAMLprim value
+caml_binaryen_add_tag_import__bytecode(value * argv) {
+  return caml_binaryen_add_tag_import(argv[0], argv[1], argv[2], argv[3], argv[4], argv[5]);
+}
+
 CAMLprim value
 caml_binaryen_function_import_get_module(value _fun) {
   CAMLparam1(_fun);
@@ -89,6 +107,13 @@ caml_binaryen_global_import_get_module(value _global) {
   CAMLreturn(caml_copy_string(BinaryenGlobalImportGetModule(global)));
 }
 
+CAMLprim value
+caml_binaryen_tag_import_get_module(value _tag) {
+  CAMLparam1(_tag);
+  BinaryenTagRef tag = BinaryenTagRef_val(_tag);
+  CAMLreturn(caml_copy_string(BinaryenTagImportGetModule(tag)));
+}
+
 CAMLprim value
 caml_binaryen_function_import_get_base(value _fun) {
   CAMLparam1(_fun);
@@ -110,3 +135,10 @@ caml_binaryen_global_import_get_base(value _global) {
   BinaryenGlobalRef global = BinaryenGlobalRef_val(_global);
   CAMLreturn(caml_copy_string(BinaryenGlobalImportGetBase(global)));
 }
+
+CAMLprim value
+caml_binaryen_tag_import_get_base(value _tag) {
+  CAMLparam1(_tag);
+  BinaryenTagRef tag = BinaryenTagRef_val(_tag);
+  CAMLreturn(caml_copy_string(BinaryenTagImportGetBase(tag)));
+}

binaryen-archive/src/import.js

@@ -92,6 +92,37 @@ function caml_binaryen_add_global_import__bytecode() {
   );
 }
 
+//Provides: caml_binaryen_add_tag_import
+//Requires: caml_jsstring_of_string
+function caml_binaryen_add_tag_import(
+  wasm_mod,
+  internalName,
+  externalModuleName,
+  externalBaseName,
+  paramsty,
+  resultsty
+) {
+  return wasm_mod.addTagImport(
+    caml_jsstring_of_string(internalName),
+    caml_jsstring_of_string(externalModuleName),
+    caml_jsstring_of_string(externalBaseName),
+    paramsty,
+    resultsty
+  );
+}
+//Provides: caml_binaryen_add_tag_import__bytecode
+//Requires: caml_binaryen_add_tag_import
+function caml_binaryen_add_tag_import__bytecode() {
+  return caml_binaryen_add_tag_import(
+    arguments[0],
+    arguments[1],
+    arguments[2],
+    arguments[3],
+    arguments[4],
+    arguments[5]
+  );
+}
+
 //Provides: caml_binaryen_function_import_get_module
 //Requires: Binaryen
 //Requires: caml_string_of_jsstring
@@ -115,6 +146,14 @@ function caml_binaryen_global_import_get_module(global) {
   return caml_string_of_jsstring(global_info.module);
 }
 
+//Provides: caml_binaryen_tag_import_get_module
+//Requires: Binaryen
+//Requires: caml_string_of_jsstring
+function caml_binaryen_tag_import_get_module(tag) {
+  var tag_info = Binaryen.getTagInfo(tag);
+  return caml_string_of_jsstring(tag_info.module);
+}
+
 //Provides: caml_binaryen_function_import_get_base
 //Requires: Binaryen
 //Requires: caml_string_of_jsstring
@@ -137,3 +176,11 @@ function caml_binaryen_global_import_get_base(global) {
   var global_info = Binaryen.getGlobalInfo(global);
   return caml_string_of_jsstring(global_info.base);
 }
+
+//Provides: caml_binaryen_tag_import_get_base
+//Requires: Binaryen
+//Requires: caml_string_of_jsstring
+function caml_binaryen_tag_import_get_base(tag) {
+  var tag_info = Binaryen.getTagInfo(tag);
+  return caml_string_of_jsstring(tag_info.base);
+}

binaryen-archive/src/import.ml

@@ -21,6 +21,12 @@ external add_global_import :
 (** Module, internal name, external module name, external base name, type,
     mutable. *)
 
+external add_tag_import :
+  Module.t -> string -> string -> string -> Type.t -> Type.t -> unit
+  = "caml_binaryen_add_tag_import__bytecode" "caml_binaryen_add_tag_import"
+(** Module, internal name, external module name, external base name, params
+    type, results type. *)
+
 external function_import_get_module : Function.t -> string
   = "caml_binaryen_function_import_get_module"
 
@@ -30,6 +36,9 @@ external memory_import_get_module : Module.t -> string -> string
 external global_import_get_module : Global.t -> string
   = "caml_binaryen_global_import_get_module"
 
+external tag_import_get_module : Tag.t -> string
+  = "caml_binaryen_tag_import_get_module"
+
 external function_import_get_base : Function.t -> string
   = "caml_binaryen_function_import_get_base"
 
@@ -38,3 +47,6 @@ external memory_import_get_base : Module.t -> string -> string
 
 external global_import_get_base : Global.t -> string
   = "caml_binaryen_global_import_get_base"
+
+external tag_import_get_base : Tag.t -> string
+  = "caml_binaryen_tag_import_get_base"

binaryen-archive/src/import.mli

@@ -7,9 +7,14 @@ val add_memory_import : Module.t -> string -> string -> string -> bool -> unit
 val add_global_import :
   Module.t -> string -> string -> string -> Type.t -> bool -> unit
 
+val add_tag_import :
+  Module.t -> string -> string -> string -> Type.t -> Type.t -> unit
+
 val function_import_get_module : Function.t -> string
 val memory_import_get_module : Module.t -> string -> string
 val global_import_get_module : Global.t -> string
+val tag_import_get_module : Tag.t -> string
 val function_import_get_base : Function.t -> string
 val memory_import_get_base : Module.t -> string -> string
 val global_import_get_base : Global.t -> string
+val tag_import_get_base : Tag.t -> string

binaryen-archive/src/memory.c

@@ -121,7 +121,12 @@ caml_binaryen_get_memory_segment_byte_offset(value _module, value _name) {
   CAMLparam2(_module, _name);
   BinaryenModuleRef module = BinaryenModuleRef_val(_module);
   char* name = Safe_String_val(_name);
-  CAMLreturn(Val_int(BinaryenGetMemorySegmentByteOffset(module, name)));
+  if (BinaryenGetMemorySegmentPassive(module, name)) {
+    CAMLreturn(Val_none);
+  } else {
+    int offset = BinaryenGetMemorySegmentByteOffset(module, name);
+    CAMLreturn(caml_alloc_some(Val_int(offset)));
+  }
 }
 
 CAMLprim value

binaryen-archive/src/memory.js

@@ -112,10 +112,10 @@ function caml_binaryen_get_num_memory_segments(wasm_mod) {
 }
 
 //Provides: caml_binaryen_get_memory_segment_byte_offset
-//Requires: caml_jsstring_of_string
+//Requires: caml_jsstring_of_string, to_option
 function caml_binaryen_get_memory_segment_byte_offset(wasm_mod, name) {
   var info = wasm_mod.getMemorySegmentInfo(caml_jsstring_of_string(name));
-  return info.offset;
+  return to_option(info.offset);
 }
 
 //Provides: caml_binaryen_get_memory_segment_passive

binaryen-archive/src/memory.ml

@@ -71,7 +71,7 @@ let unlimited = -1
 external get_num_segments : Module.t -> int
   = "caml_binaryen_get_num_memory_segments"
 
-external get_segment_byte_offset : Module.t -> string -> int
+external get_segment_byte_offset : Module.t -> string -> int option
   = "caml_binaryen_get_memory_segment_byte_offset"
 
 external get_segment_passive : Module.t -> string -> bool

binaryen-archive/src/memory.mli

@@ -20,6 +20,6 @@ val is_shared : Module.t -> string -> bool
 val is_64 : Module.t -> string -> bool
 val unlimited : int
 val get_num_segments : Module.t -> int
-val get_segment_byte_offset : Module.t -> string -> int
+val get_segment_byte_offset : Module.t -> string -> int option
 val get_segment_passive : Module.t -> string -> bool
 val get_segment_data : Module.t -> string -> bytes

binaryen-archive/src/module.js

@@ -17,36 +17,24 @@ function caml_binaryen_module_parse(text) {
 }
 
 //Provides: caml_binaryen_module_print
-//Requires: caml_sys_fds
-//Requires: caml_string_of_jsstring
-//Requires: caml_ml_output, caml_ml_string_length
+//Requires: caml_ml_output_str_stdout
 function caml_binaryen_module_print(wasm_mod) {
   var text = wasm_mod.emitText();
-  var chanid = caml_sys_fds[1].chanid; // stdout
-  var s = caml_string_of_jsstring(text);
-  caml_ml_output(chanid, s, 0, caml_ml_string_length(s));
+  caml_ml_output_str_stdout(text);
 }
 
 //Provides: caml_binaryen_module_print_asmjs
-//Requires: caml_sys_fds
-//Requires: caml_string_of_jsstring
-//Requires: caml_ml_output, caml_ml_string_length
+//Requires: caml_ml_output_str_stdout
 function caml_binaryen_module_print_asmjs(wasm_mod) {
   var asm = wasm_mod.emitAsmjs();
-  var chanid = caml_sys_fds[1].chanid; // stdout
-  var s = caml_string_of_jsstring(asm);
-  caml_ml_output(chanid, s, 0, caml_ml_string_length(s));
+  caml_ml_output_str_stdout(asm);
 }
 
 //Provides: caml_binaryen_module_print_stack_ir
-//Requires: caml_sys_fds
-//Requires: caml_string_of_jsstring
-//Requires: caml_ml_output, caml_ml_string_length
+//Requires: caml_ml_output_str_stdout
 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));
+  caml_ml_output_str_stdout(stackir);
 }
 
 //Provides: caml_binaryen_module_validate
@@ -122,16 +110,15 @@ function caml_binaryen_module_get_debug_info_filename(wasm_mod, index) {
 }
 
 //Provides: caml_binaryen_add_custom_section
-//Requires: caml_jsstring_of_string, caml_array_of_string
+//Requires: caml_jsstring_of_string, caml_uint8_array_of_string
 function caml_binaryen_add_custom_section(wasm_mod, name, contents) {
   return wasm_mod.addCustomSection(
     caml_jsstring_of_string(name),
-    caml_array_of_string(contents)
+    caml_uint8_array_of_string(contents)
   );
 }
 
 //Provides: caml_binaryen_module_update_maps
 function caml_binaryen_module_update_maps(wasm_mod) {
-  // The JS version doesn't expose `update_maps`
-  return;
+  return wasm_mod.updateMaps();
 }

binaryen-archive/src/module.ml

@@ -98,6 +98,10 @@ module Feature = struct
 
   let call_indirect_overlong = call_indirect_overlong ()
 
+  external relaxed_atomics : unit -> t = "caml_binaryen_feature_relaxed_atomics"
+
+  let relaxed_atomics = relaxed_atomics ()
+
   external all : unit -> t = "caml_binaryen_feature_all"
 
   let all = all ()

binaryen-archive/src/module.mli

@@ -25,6 +25,7 @@ module Feature : sig
   val fp16 : t
   val bulk_memory_opt : t
   val call_indirect_overlong : t
+  val relaxed_atomics : t
   val all : t
 end
 

binaryen-archive/src/module_feature.c

@@ -155,6 +155,12 @@ caml_binaryen_feature_call_indirect_overlong(value unit) {
   CAMLreturn(Val_int(BinaryenFeatureCallIndirectOverlong()));
 }
 
+CAMLprim value
+caml_binaryen_feature_relaxed_atomics(value unit) {
+  CAMLparam1(unit);
+  CAMLreturn(Val_int(BinaryenFeatureRelaxedAtomics()));
+}
+
 CAMLprim value
 caml_binaryen_feature_all(value unit) {
   CAMLparam1(unit);

binaryen-archive/src/module_feature.js

@@ -140,6 +140,12 @@ function caml_binaryen_feature_call_indirect_overlong() {
   return Binaryen.Features.BulkMemoryOpt;
 }
 
+//Provides: caml_binaryen_feature_relaxed_atomics
+//Requires: Binaryen
+function caml_binaryen_feature_relaxed_atomics() {
+  return Binaryen.Features.RelaxedAtomics;
+}
+
 //Provides: caml_binaryen_feature_all
 //Requires: Binaryen
 function caml_binaryen_feature_all() {

binaryen-archive/src/ocaml_helpers.c

@@ -3,6 +3,7 @@
 #include <caml/fail.h>
 #include <caml/memory.h>
 #include <caml/callback.h>
+#include <caml/alloc.h>
 
 #include "ocaml_helpers.h"
 
@@ -38,6 +39,14 @@ value alloc_BinaryenGlobalRef(BinaryenGlobalRef exp)
   return v;
 }
 
+/* Allocating an OCaml custom block to hold the given BinaryenTagRef */
+value alloc_BinaryenTagRef(BinaryenTagRef exp)
+{
+  value v = caml_alloc_custom(&binaryen_ops, sizeof(BinaryenTagRef), 0, 1);
+  BinaryenTagRef_val(v) = exp;
+  return v;
+}
+
 /* Allocating an OCaml custom block to hold the given BinaryenExportRef */
 value alloc_BinaryenExportRef(BinaryenExportRef exp)
 {
@@ -94,6 +103,14 @@ value alloc_BinaryenElementSegmentRef(BinaryenElementSegmentRef elem)
   return v;
 }
 
+/* Allocating an OCaml custom block to hold the given TypeBuilderRef */
+value alloc_TypeBuilderRef(TypeBuilderRef builder)
+{
+  value v = caml_alloc_custom(&binaryen_ops, sizeof(TypeBuilderRef), 0, 1);
+  TypeBuilderRef_val(v) = builder;
+  return v;
+}
+
 CAMLprim value
 array_of_list(value list) {
   CAMLparam1(list);

binaryen-archive/src/ocaml_helpers.h

@@ -23,15 +23,18 @@ static struct custom_operations binaryen_ops = {
 
 #define BinaryenModuleRef_val(v) (*((BinaryenModuleRef*) Data_custom_val(v)))
 #define BinaryenType_val(v) (*((BinaryenType*) Data_custom_val(v)))
+#define BinaryenPackedType_val(v) Int_val(v)
 #define BinaryenHeapType_val(v) (*((BinaryenHeapType*) Data_custom_val(v)))
 #define BinaryenExpressionRef_val(v) (*((BinaryenExpressionRef*) Data_custom_val(v)))
 #define BinaryenOp_val(v) (*((BinaryenOp*) Data_custom_val(v)))
 #define BinaryenLiteral_val(v) (*((struct BinaryenLiteral*) Data_custom_val(v)))
 #define BinaryenFunctionRef_val(v) (*((BinaryenFunctionRef*) Data_custom_val(v)))
 #define BinaryenGlobalRef_val(v) (*((BinaryenGlobalRef*) Data_custom_val(v)))
+#define BinaryenTagRef_val(v) (*((BinaryenTagRef*) 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 TypeBuilderRef_val(v) (*((TypeBuilderRef*) Data_custom_val(v)))
 
 #define Val_none Val_int(0)
 #define Some_val(v) Field(v, 0)
@@ -53,6 +56,9 @@ value alloc_BinaryenType(BinaryenType typ);
 /* Allocating an OCaml custom block to hold the given BinaryenGlobalRef */
 value alloc_BinaryenGlobalRef(BinaryenGlobalRef exp);
 
+/* Allocating an OCaml custom block to hold the given BinaryenTagRef */
+value alloc_BinaryenTagRef(BinaryenTagRef exp);
+
 /* Allocating an OCaml custom block to hold the given BinaryenExportRef */
 value alloc_BinaryenExportRef(BinaryenExportRef exp);
 
@@ -74,6 +80,9 @@ value alloc_BinaryenTableRef(BinaryenTableRef table);
 /* Allocating an OCaml custom block to hold the given BinaryenElementSegmentRef */
 value alloc_BinaryenElementSegmentRef(BinaryenElementSegmentRef elem);
 
+/* Allocating an OCaml custom block to hold the given TypeBuilderRef */
+value alloc_TypeBuilderRef(TypeBuilderRef builder);
+
 CAMLprim value
 array_of_list(value list);
 

binaryen-archive/src/ocaml_helpers.js

@@ -0,0 +1,11 @@
+//Provides: caml_ml_output_str_stdout
+//Requires: caml_ml_std_channel_id
+//Requires: caml_string_of_jsstring
+//Requires: caml_ml_output, caml_ml_string_length
+function caml_ml_output_str_stdout(text) {
+  var chanid = caml_ml_std_channel_id[1]; // stdout
+  
+  const raw_string = caml_string_of_jsstring(text);
+  const length = caml_ml_string_length(raw_string);
+  caml_ml_output(chanid, raw_string, 0, length);
+}