@grain/binaryen.ml 0.11.0 → 0.12.1

binaryen-archive/js/dune

@@ -10,4 +10,4 @@
   (names stubs))
  (js_of_ocaml
   (flags --no-sourcemap)
-  (javascript_files binaryen.es5.js postlude.js)))
+  (javascript_files prelude.js binaryen.es5.js postlude.js)))

binaryen-archive/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/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/js/postlude.js

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

binaryen-archive/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/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/package.json

@@ -1,21 +1,24 @@
 {
   "name": "@grain/binaryen.ml",
-  "version": "0.11.0",
+  "version": "0.12.1",
   "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": "^101.0.1",
+    "ocaml": ">= 4.12.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"
+    "@opam/js_of_ocaml": ">= 3.10.0 < 4.0.0",
+    "@opam/js_of_ocaml-ppx": ">= 3.10.0 < 4.0.0"
   },
   "devDependencies": {
-    "@opam/js_of_ocaml-compiler": "^3.10.0",
-    "@opam/ocamlformat": "0.18.0",
-    "@opam/ocaml-lsp-server": "^1.8.2"
+    "@opam/js_of_ocaml-compiler": ">= 3.10.0 < 4.0.0",
+    "@opam/ocamlformat": "0.20.1",
+    "@opam/ocaml-lsp-server": "^1.9.1"
+  },
+  "resolutions": {
+    "@opam/ocp-indent": "1.7.0"
   },
   "esy": {
     "build": "dune build -p binaryen"

binaryen-archive/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/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/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/src/dune

@@ -10,5 +10,4 @@
     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))
- (c_library_flags :standard -lstdc++ -lpthread))
+  (flags :standard -O2 -Wall -Wextra)))

binaryen-archive/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/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/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/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/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/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/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/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 ->

binaryen-archive/esy.lock/opam/ocaml-migrate-parsetree.2.3.0/opam

@@ -1,39 +0,0 @@
-opam-version: "2.0"
-maintainer: "frederic.bour@lakaban.net"
-authors: [
-  "Frédéric Bour <frederic.bour@lakaban.net>"
-  "Jérémie Dimino <jeremie@dimino.org>"
-]
-license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
-homepage: "https://github.com/ocaml-ppx/ocaml-migrate-parsetree"
-bug-reports: "https://github.com/ocaml-ppx/ocaml-migrate-parsetree/issues"
-dev-repo: "git+https://github.com/ocaml-ppx/ocaml-migrate-parsetree.git"
-doc: "https://ocaml-ppx.github.io/ocaml-migrate-parsetree/"
-tags: [ "syntax" "org:ocamllabs" ]
-build: ["dune" "build" "-p" name "-j" jobs]
-run-test: ["dune" "runtest" "-p" name "-j" jobs]
-depends: [
-  "dune" {>= "2.3"}
-  "ocaml" {>= "4.02.3" & < "4.15"}
-  "cinaps" {with-test & >= "v0.13.0"}
-]
-conflicts: [
-  "base-effects"
-]
-synopsis: "Convert OCaml parsetrees between different versions"
-description: """
-Convert OCaml parsetrees between different versions
-
-This library converts parsetrees, outcometree and ast mappers between
-different OCaml versions.  High-level functions help making PPX
-rewriters independent of a compiler version.
-"""
-url {
-  src:
-    "https://github.com/ocaml-ppx/ocaml-migrate-parsetree/releases/download/v2.3.0/ocaml-migrate-parsetree-2.3.0.tbz"
-  checksum: [
-    "sha256=108126b247f190e04c8afd3d72ced0b63ffdf73c3f801f09be5db0cd7280bf0a"
-    "sha512=cccd766d33e2c70015735e050c2b7cdacf9f046e2874b563ef64b77706f56d004aa9b9df7d5cc201e5f3ba6e3267f95f654e1e3de58891b91f9c28a61988a9ee"
-  ]
-}
-x-commit-hash: "7ef6ff49bfd7d6d816be61d3acea460af25d7d99"

binaryen-archive/esy.lock/opam/odoc.1.5.3/opam

@@ -1,53 +0,0 @@
-opam-version: "2.0"
-
-homepage: "http://github.com/ocaml/odoc"
-doc: "https://ocaml.github.io/odoc/"
-bug-reports: "https://github.com/ocaml/odoc/issues"
-license: "ISC"
-
-authors: [
-  "Thomas Refis <trefis@janestreet.com>"
-  "David Sheets <sheets@alum.mit.edu>"
-  "Leo White <leo@lpw25.net>"
-  "Anton Bachin <antonbachin@yahoo.com>"
-  "Jon Ludlam <jon@recoil.org>"
-]
-maintainer: "Jon Ludlam <jon@recoil.org>"
-dev-repo: "git+https://github.com/ocaml/odoc.git"
-
-synopsis: "OCaml documentation generator"
-description: """
-Odoc is a documentation generator for OCaml. It reads doc comments,
-delimited with `(** ... *)`, and outputs HTML. 
-"""
-
-depends: [
-  "astring"
-  "cmdliner" {>= "1.0.0"}
-  "cppo" {build & >= "1.1.0"}
-  "dune"
-  "fpath"
-  "ocaml" {>= "4.02.0" & < "4.14"}
-  "result"
-  "tyxml" {>= "4.3.0"}
-
-  "alcotest" {dev & >= "0.8.3" & with-test}
-  "markup" {dev & >= "1.0.0" & with-test}
-  "ocamlfind" {dev}
-  "sexplib" {dev & >= "113.33.00" & with-test}
-
-  "bisect_ppx" {dev & >= "1.3.0"}
-]
-
-build: [
-  ["dune" "subst"] {dev}
-  ["dune" "build" "-p" name "-j" jobs]
-]
-url {
-  src: "https://github.com/ocaml/odoc/releases/download/1.5.3/odoc-1.5.3.tbz"
-  checksum: [
-    "sha256=f2b76f811658c4b52cb48ac4ffc2ec37cedd2a805111c7f8ec20f8f36b8bbf45"
-    "sha512=9e069590e0737c94813d25235b5cfe27feb5a0298a17ff9b9ee446c69827c3a0ea3b7da5d05b278639cd1f0202e0d83356707979edfaa2af73876fc000c23c4d"
-  ]
-}
-x-commit-hash: "8de4a36814533b25b461373fe5c0f54db55e5e7c"

binaryen-archive/esy.lock/opam/tyxml.4.5.0/opam

@@ -1,42 +0,0 @@
-opam-version: "2.0"
-synopsis: "A library for building correct HTML and SVG documents"
-description:
-  "TyXML provides a set of convenient combinators that uses the OCaml type system to ensure the validity of the generated documents. TyXML can be used with any representation of HTML and SVG: the textual one, provided directly by this package, or DOM trees (`js_of_ocaml-tyxml`) virtual DOM (`virtual-dom`) and reactive or replicated trees (`eliom`). You can also create your own representation and use it to instantiate a new set of combinators."
-maintainer: ["dev@ocsigen.org"]
-authors: ["The ocsigen team"]
-license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
-homepage: "https://github.com/ocsigen/tyxml"
-doc: "https://ocsigen.org/tyxml/latest/manual/intro"
-bug-reports: "https://github.com/ocsigen/tyxml/issues"
-depends: [
-  "dune" {>= "2.0"}
-  "ocaml" {>= "4.02"}
-  "alcotest" {with-test}
-  "re" {>= "1.5.0"}
-  "seq"
-  "uutf" {>= "1.0.0"}
-]
-build: [
-  ["dune" "subst"] {dev}
-  [
-    "dune"
-    "build"
-    "-p"
-    name
-    "-j"
-    jobs
-    "@install"
-    "@runtest" {with-test}
-    "@doc" {with-doc}
-  ]
-]
-dev-repo: "git+https://github.com/ocsigen/tyxml.git"
-x-commit-hash: "ef431a4bceaefb2d9248e79092e6c1a1a9420095"
-url {
-  src:
-    "https://github.com/ocsigen/tyxml/releases/download/4.5.0/tyxml-4.5.0.tbz"
-  checksum: [
-    "sha256=c69accef5df4dd89d38f6aa0baad01e8fda4e9e98bb7dad61bec1452c5716068"
-    "sha512=772535441b09c393d53c27152e65f404a0a541aa0cea1bda899a8d751ab64d1729237e583618c3ff33d75e3865d53503d1ea413c6bbc8c68c413347efd1709b3"
-  ]
-}