@grain/binaryen.ml 0.10.0 → 0.12.0

{binaryen-archive → binaryen-archive-v0.12.0}/js/dune

@@ -10,9 +10,4 @@
   (names stubs))
  (js_of_ocaml
   (flags --no-sourcemap)
-  (javascript_files binaryen.js postlude.js)))
-
-(rule
- (target binaryen.js)
- (action
-  (copy ../vendor/js/index.es5.js binaryen.js)))
+  (javascript_files prelude.js binaryen.es5.js postlude.js)))

{binaryen-archive → binaryen-archive-v0.12.0}/js/export.ml

@@ -51,7 +51,7 @@ let external_memory = meth_call global##.binaryen "_BinaryenExternalMemory" [||]
 
 let external_global = meth_call global##.binaryen "_BinaryenExternalGlobal" [||]
 
-let external_event = meth_call global##.binaryen "_BinaryenExternalEvent" [||]
+let external_tag = meth_call global##.binaryen "_BinaryenExternalTag" [||]
 
 let export_get_kind export =
   let export_info =

{binaryen-archive → binaryen-archive-v0.12.0}/js/module.ml

@@ -74,7 +74,9 @@ let get_features wasm_mod =
         feature :: split_features (feature lsr 1)
     | feature -> split_features (feature lsr 1)
   in
-  split_features 0x80000000
+  (* Support 32-bit OCaml where integers are 31 bits *)
+  (* This supports up to 31 Binaryen features *)
+  split_features 0x40000000
 
 let set_features wasm_mod features =
   meth_call wasm_mod "setFeatures"
@@ -112,3 +114,6 @@ let add_debug_info_filename wasm_mod filename =
 
 let get_debug_info_filename wasm_mod index =
   meth_call wasm_mod "getDebugInfoFileName" [| inject index |]
+
+(* The JS version doesn't expose `update_maps` *)
+let update_maps wasm_mod = ()

binaryen-archive-v0.12.0/js/postlude.js

@@ -0,0 +1,2 @@
+// Attach binaryen to globalThis because JSOO wraps in an iife
+globalThis.binaryen = module.exports;

binaryen-archive-v0.12.0/js/prelude.js

@@ -0,0 +1,11 @@
+if (typeof module === 'undefined') {
+  module = {};
+}
+
+if (typeof exports === 'undefined') {
+  exports = {};
+}
+
+if (typeof module.exports === 'undefined') {
+  module.exports = exports;
+}

{binaryen-archive → binaryen-archive-v0.12.0}/js/table.ml

@@ -3,9 +3,9 @@ open Js_of_ocaml.Js.Unsafe
 
 type t = int
 
-let add_table wasm_mod name initial maximum =
+let add_table wasm_mod name initial maximum tableType =
   meth_call wasm_mod "addTable"
-    [| inject (string name); inject initial; inject maximum |]
+    [| inject (string name); inject initial; inject maximum; inject tableType |]
 
 let add_active_element_segment wasm_mod table name funcnames offset =
   meth_call wasm_mod "addActiveElementSegment"

binaryen-archive-v0.12.0/package.json

@@ -0,0 +1,37 @@
+{
+  "name": "@grain/binaryen.ml",
+  "version": "0.12.0",
+  "description": "OCaml bindings for Binaryen.",
+  "author": "Oscar Spencer <oscar@grain-lang.org>",
+  "license": "Apache-2.0",
+  "dependencies": {
+    "ocaml": ">= 4.12.0 < 4.13.0",
+    "@grain/libbinaryen": "^102.0.4",
+    "@opam/dune": "^2.9.1",
+    "@opam/dune-configurator": "^2.9.1",
+    "@opam/js_of_ocaml": "^3.10.0",
+    "@opam/js_of_ocaml-ppx": "^3.10.0"
+  },
+  "devDependencies": {
+    "@opam/js_of_ocaml-compiler": "^3.10.0",
+    "@opam/ocamlformat": "0.18.0",
+    "@opam/ocaml-lsp-server": "^1.8.2"
+  },
+  "esy": {
+    "build": "dune build -p binaryen"
+  },
+  "scripts": {
+    "test": "esy b dune runtest",
+    "format": "dune build @fmt --auto-promote"
+  },
+  "installConfig": {
+    "pnp": false
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "keywords": [
+    "binaryen",
+    "ocaml"
+  ]
+}

{binaryen-archive → binaryen-archive-v0.12.0}/src/binaryen_stubs_exports.c

@@ -130,9 +130,9 @@ caml_binaryen_external_global(value _unit) {
 }
 
 CAMLprim value
-caml_binaryen_external_event(value _unit) {
+caml_binaryen_external_tag(value _unit) {
   CAMLparam1(_unit);
-  CAMLreturn(Val_int(BinaryenExternalEvent()));
+  CAMLreturn(Val_int(BinaryenExternalTag()));
 }
 
 CAMLprim value

{binaryen-archive → binaryen-archive-v0.12.0}/src/binaryen_stubs_modules.c

@@ -172,3 +172,10 @@ caml_binaryen_add_custom_section(value _module, value _name, value _contents) {
   BinaryenAddCustomSection(module, name, contents, contentsLen);
   CAMLreturn(Val_unit);
 }
+
+CAMLprim value
+caml_binaryen_module_update_maps(value module) {
+  CAMLparam1(module);
+  BinaryenModuleUpdateMaps(BinaryenModuleRef_val(module));
+  CAMLreturn(Val_unit);
+}

{binaryen-archive → binaryen-archive-v0.12.0}/src/binaryen_stubs_tables.c

@@ -33,13 +33,14 @@ static value alloc_BinaryenExpressionRef(BinaryenExpressionRef exp)
 }
 
 CAMLprim value
-caml_binaryen_add_table(value _module, value _table, value _initial, value _maximum) {
-  CAMLparam4(_module, _table, _initial, _maximum);
+caml_binaryen_add_table(value _module, value _table, value _initial, value _maximum, value _tableType) {
+  CAMLparam5(_module, _table, _initial, _maximum, _tableType);
   BinaryenModuleRef module = BinaryenModuleRef_val(_module);
   char* table = Safe_String_val(_table);
   BinaryenIndex initial = Int_val(_initial);
   BinaryenIndex maximum = Int_val(_maximum);
-  CAMLreturn(alloc_BinaryenTableRef(BinaryenAddTable(module, table, initial, maximum)));
+  BinaryenType tableType = BinaryenType_val(_tableType);
+  CAMLreturn(alloc_BinaryenTableRef(BinaryenAddTable(module, table, initial, maximum, tableType)));
 }
 
 CAMLprim value

binaryen-archive-v0.12.0/src/dune

@@ -0,0 +1,13 @@
+(library
+ (name binaryen_native)
+ (public_name binaryen.native)
+ (implements binaryen)
+ (libraries libbinaryen.c)
+ (foreign_stubs
+  (language c)
+  (names binaryen_stubs_types binaryen_stubs_ops binaryen_stubs_literals
+    binaryen_stubs_expressions binaryen_stubs_functions
+    binaryen_stubs_imports binaryen_stubs_exports binaryen_stubs_globals
+    binaryen_stubs_tables binaryen_stubs_memory binaryen_stubs_features
+    binaryen_stubs_modules binaryen_stubs_settings ocaml_helpers)
+  (flags :standard -O2 -Wall -Wextra)))

{binaryen-archive → binaryen-archive-v0.12.0}/src/export.ml

@@ -47,8 +47,8 @@ external external_global : unit -> int = "caml_binaryen_external_global"
 
 let external_global = external_global ()
 
-external external_event : unit -> int = "caml_binaryen_external_event"
+external external_tag : unit -> int = "caml_binaryen_external_tag"
 
-let external_event = external_event ()
+let external_tag = external_tag ()
 
 external export_get_kind : t -> int = "caml_binaryen_export_get_kind"

{binaryen-archive → binaryen-archive-v0.12.0}/src/module.ml

@@ -85,7 +85,9 @@ let get_features wasm_mod =
         feature :: split_features (feature lsr 1)
     | feature -> split_features (feature lsr 1)
   in
-  split_features 0x80000000
+  (* 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"
 
@@ -111,3 +113,5 @@ external add_debug_info_filename : t -> string -> int
 
 external get_debug_info_filename : t -> int -> string
   = "caml_binaryen_module_get_debug_info_filename"
+
+external update_maps : t -> unit = "caml_binaryen_module_update_maps"

{binaryen-archive → binaryen-archive-v0.12.0}/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 → binaryen-archive-v0.12.0}/src/ocaml_helpers.h

@@ -40,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 → binaryen-archive-v0.12.0}/src/table.ml

@@ -1,8 +1,8 @@
 type t
 
-external add_table : Module.t -> string -> int -> int -> t
+external add_table : Module.t -> string -> int -> int -> Type.t -> t
   = "caml_binaryen_add_table"
-(** Module, name, initial size, maximum size. *)
+(** Module, name, initial size, maximum size, table type *)
 
 external add_active_element_segment :
   Module.t ->

binaryen-archive-v0.12.0/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-v0.12.0/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 → binaryen-archive-v0.12.0}/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})))
 

{binaryen-archive → binaryen-archive-v0.12.0}/test/test.expected

@@ -1,8 +1,8 @@
 (module
  (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
  (type $none_=>_none (func))
- (type $externref_=>_i32 (func (param externref) (result i32)))
  (type $externref_i32_i32_=>_i32 (func (param externref i32 i32) (result i32)))
+ (type $externref_=>_i32 (func (param externref) (result i32)))
  (import "future-wasi" "write" (func $write (param externref i32 i32) (result i32)))
  (global $max_int64 i64 (i64.const 9223372036854775807))
  (global $test_float64_bits f64 (f64.const 1.23))
@@ -49,10 +49,10 @@
  )
 )
 (module
- (type $none_=>_none (func))
- (type $externref_=>_i32 (func (param externref) (result i32)))
  (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $none_=>_none (func))
  (type $externref_i32_i32_=>_i32 (func (param externref i32 i32) (result i32)))
+ (type $externref_=>_i32 (func (param externref) (result i32)))
  (import "future-wasi" "write" (func $write (param externref i32 i32) (result i32)))
  (memory $0 1)
  (table $table 1 1 funcref)
@@ -90,10 +90,10 @@
  )
 )
 (module
+ (type $externref_i32_i32_=>_i32 (func (param externref i32 i32) (result i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
  (type $none_=>_none (func))
  (type $externref_=>_i32 (func (param externref) (result i32)))
- (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
- (type $externref_i32_i32_=>_i32 (func (param externref i32 i32) (result i32)))
  (import "future-wasi" "write" (func $fimport$0 (param externref i32 i32) (result i32)))
  (memory $0 1)
  (table $0 1 1 funcref)

{binaryen-archive → binaryen-archive-v0.12.0}/test/test.ml

@@ -77,7 +77,7 @@ let start =
 
 let _ = Export.add_function_export wasm_mod "adder" "adder"
 
-let _ = Table.add_table wasm_mod "table" 1 1
+let _ = Table.add_table wasm_mod "table" 1 1 Type.funcref
 
 let _ =
   Global.add_global wasm_mod "max_int64" Type.int64 false
@@ -116,6 +116,9 @@ let _ =
 
 let _ = Export.add_function_export wasm_mod "hello" "hello"
 
+(* Shouldn't actually do anything since we aren't doing function renames *)
+let _ = Module.update_maps wasm_mod
+
 (* Finally, we print 3 versions of the module to be checked against test.expected *)
 
 (* 1. Print the the module as-is *)

{binaryen-archive → binaryen-archive-v0.12.0}/virtual/export.mli

@@ -28,6 +28,6 @@ val external_memory : int
 
 val external_global : int
 
-val external_event : int
+val external_tag : int
 
 val export_get_kind : t -> int

{binaryen-archive → binaryen-archive-v0.12.0}/virtual/module.mli

@@ -63,3 +63,5 @@ val interpret : t -> unit
 val add_debug_info_filename : t -> string -> int
 
 val get_debug_info_filename : t -> int -> string
+
+val update_maps : t -> unit

{binaryen-archive → binaryen-archive-v0.12.0}/virtual/table.mli

@@ -1,6 +1,6 @@
 type t
 
-val add_table : Module.t -> string -> int -> int -> t
+val add_table : Module.t -> string -> int -> int -> Type.t -> t
 
 val add_active_element_segment :
   Module.t ->