@grain/binaryen.ml 0.14.1 → 0.15.0

binaryen-archive/CHANGELOG.md

@@ -1,5 +1,31 @@
 # Changelog
 
+## [0.15.0](https://github.com/grain-lang/binaryen.ml/compare/v0.14.1...v0.15.0) (2022-03-16)
+
+
+### ⚠ BREAKING CHANGES
+
+* Rename segment name to data (#146)
+* Add Passes module & require `Passes.t` in `Module.run_passes` (#145)
+* Remove virtual modules
+* Remove the "jsoo hack" API
+* Update libbinaryen to v105 (#142)
+
+### Features
+
+* Add Passes module & require `Passes.t` in `Module.run_passes` ([#145](https://github.com/grain-lang/binaryen.ml/issues/145)) ([c3e751c](https://github.com/grain-lang/binaryen.ml/commit/c3e751c4f869b9481e18c85a525100fbdcfa9072))
+* Remove the "jsoo hack" API ([3c81209](https://github.com/grain-lang/binaryen.ml/commit/3c81209763e3d09d51a5ab68ebd705582fe02c54))
+* Remove unneeded js_of_ocaml & js_of_ocaml-ppx deps ([3c81209](https://github.com/grain-lang/binaryen.ml/commit/3c81209763e3d09d51a5ab68ebd705582fe02c54))
+* Remove virtual modules ([3c81209](https://github.com/grain-lang/binaryen.ml/commit/3c81209763e3d09d51a5ab68ebd705582fe02c54))
+* Rename segment name to data ([#146](https://github.com/grain-lang/binaryen.ml/issues/146)) ([d55e577](https://github.com/grain-lang/binaryen.ml/commit/d55e5773d39fd5f21f556e0f5493d6c60bbc2198))
+* Rewrite JS bindings as js_of_ocaml externals ([3c81209](https://github.com/grain-lang/binaryen.ml/commit/3c81209763e3d09d51a5ab68ebd705582fe02c54))
+* Update libbinaryen to v105 ([#142](https://github.com/grain-lang/binaryen.ml/issues/142)) ([3c81209](https://github.com/grain-lang/binaryen.ml/commit/3c81209763e3d09d51a5ab68ebd705582fe02c54))
+
+
+### Bug Fixes
+
+* Make memory segments work with js_of_ocaml ([3c81209](https://github.com/grain-lang/binaryen.ml/commit/3c81209763e3d09d51a5ab68ebd705582fe02c54))
+
 ### [0.14.1](https://github.com/grain-lang/binaryen.ml/compare/v0.14.0...v0.14.1) (2022-03-08)
 
 

binaryen-archive/README.md

@@ -106,6 +106,22 @@ If you are planning to create portable binaries for Windows, it will try to find
 
 These flags might not work on other operating systems (like MacOS), so you'll probably need to use `dune-configurator` to vary the flags per platform.
 
+## JavaScript
+
+When compiling to JavaScript with `js_of_ocaml`, you'll need to add the `--disable share` flag. This is needed until we can depend on the bug fix from [ocsigen/js_of_ocaml#1249](https://github.com/ocsigen/js_of_ocaml/pull/1249). In the meantime, you can change your dune file:
+
+```diff
+ (executable
+  (name example)
+  (public_name example)
+  (modes
+   (byte js))
++ (js_of_ocaml
++  (flags --disable share))
+  (modules example)
+  (libraries binaryen))
+```
+
 ## Contributing
 
 You'll need Node.js and [`esy`](https://esy.sh/docs/en/getting-started.html#install-esy) to build this project.

binaryen-archive/binaryen.opam

@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "0.14.1"
+version: "0.15.0"
 synopsis: "OCaml bindings for Binaryen"
 maintainer: "oscar@grain-lang.org"
 author: "Oscar Spencer"
@@ -15,8 +15,6 @@ depends: [
   "ocaml" {>= "4.12"}
   "dune" {>= "2.9.1" < "3.0.0"}
   "dune-configurator" {>= "2.9.1" < "3.0.0"}
-  "js_of_ocaml" {>= "3.10.0" < "4.0.0"}
-  "js_of_ocaml-ppx" {>= "3.10.0" < "4.0.0"}
   "js_of_ocaml-compiler" {>= "3.10.0" < "4.0.0"}
-  "libbinaryen" {>= "104.0.0" < "105.0.0"}
+  "libbinaryen" {>= "105.1.0" < "106.0.0"}
 ]

binaryen-archive/dune

@@ -1 +1 @@
-(dirs :standard virtual js)
+(dirs :standard)

binaryen-archive/esy.lock/index.json

@@ -1,5 +1,5 @@
 {
-  "checksum": "4cdd2a2ff2fda55cbe5e06c8f5171acc",
+  "checksum": "3afbecb7a1e1a32cb100ffcb7796a67a",
   "root": "@grain/binaryen.ml@link-dev:./package.json",
   "node": {
     "ocaml@4.13.1000@d41d8cd9": {
@@ -126,34 +126,6 @@
       ],
       "devDependencies": [ "ocaml@4.13.1000@d41d8cd9" ]
     },
-    "@opam/uchar@opam:0.0.2@aedf91f9": {
-      "id": "@opam/uchar@opam:0.0.2@aedf91f9",
-      "name": "@opam/uchar",
-      "version": "opam:0.0.2",
-      "source": {
-        "type": "install",
-        "source": [
-          "archive:https://opam.ocaml.org/cache/md5/c9/c9ba2c738d264c420c642f7bb1cf4a36#md5:c9ba2c738d264c420c642f7bb1cf4a36",
-          "archive:https://github.com/ocaml/uchar/releases/download/v0.0.2/uchar-0.0.2.tbz#md5:c9ba2c738d264c420c642f7bb1cf4a36"
-        ],
-        "opam": {
-          "name": "uchar",
-          "version": "0.0.2",
-          "path": "esy.lock/opam/uchar.0.0.2"
-        }
-      },
-      "overrides": [
-        {
-          "opamoverride":
-            "esy.lock/overrides/opam__s__uchar_opam__c__0.0.2_opam_override"
-        }
-      ],
-      "dependencies": [
-        "ocaml@4.13.1000@d41d8cd9", "@opam/ocamlbuild@opam:0.14.1@ead10f40",
-        "@esy-ocaml/substs@0.0.1@d41d8cd9"
-      ],
-      "devDependencies": [ "ocaml@4.13.1000@d41d8cd9" ]
-    },
     "@opam/topkg@opam:1.0.5@0aa59f51": {
       "id": "@opam/topkg@opam:1.0.5@0aa59f51",
       "name": "@opam/topkg",
@@ -822,34 +794,6 @@
         "@opam/dune@opam:2.9.3@f57a6d69"
       ]
     },
-    "@opam/js_of_ocaml-ppx@opam:3.11.0@4edaf441": {
-      "id": "@opam/js_of_ocaml-ppx@opam:3.11.0@4edaf441",
-      "name": "@opam/js_of_ocaml-ppx",
-      "version": "opam:3.11.0",
-      "source": {
-        "type": "install",
-        "source": [
-          "archive:https://opam.ocaml.org/cache/sha256/15/158dafe7271ac79157981d1c3f5f177ec78a0099c38f861ae14e7ac06bd29c3a#sha256:158dafe7271ac79157981d1c3f5f177ec78a0099c38f861ae14e7ac06bd29c3a",
-          "archive:https://github.com/ocsigen/js_of_ocaml/releases/download/3.11.0/js_of_ocaml-3.11.0.tbz#sha256:158dafe7271ac79157981d1c3f5f177ec78a0099c38f861ae14e7ac06bd29c3a"
-        ],
-        "opam": {
-          "name": "js_of_ocaml-ppx",
-          "version": "3.11.0",
-          "path": "esy.lock/opam/js_of_ocaml-ppx.3.11.0"
-        }
-      },
-      "overrides": [],
-      "dependencies": [
-        "ocaml@4.13.1000@d41d8cd9", "@opam/ppxlib@opam:0.25.0@8553d2e8",
-        "@opam/js_of_ocaml@opam:3.11.0@93e18d4d",
-        "@opam/dune@opam:2.9.3@f57a6d69", "@esy-ocaml/substs@0.0.1@d41d8cd9"
-      ],
-      "devDependencies": [
-        "ocaml@4.13.1000@d41d8cd9", "@opam/ppxlib@opam:0.25.0@8553d2e8",
-        "@opam/js_of_ocaml@opam:3.11.0@93e18d4d",
-        "@opam/dune@opam:2.9.3@f57a6d69"
-      ]
-    },
     "@opam/js_of_ocaml-compiler@opam:3.11.0@6004d7b8": {
       "id": "@opam/js_of_ocaml-compiler@opam:3.11.0@6004d7b8",
       "name": "@opam/js_of_ocaml-compiler",
@@ -888,36 +832,6 @@
         "@opam/cmdliner@opam:1.1.0@643a0e00"
       ]
     },
-    "@opam/js_of_ocaml@opam:3.11.0@93e18d4d": {
-      "id": "@opam/js_of_ocaml@opam:3.11.0@93e18d4d",
-      "name": "@opam/js_of_ocaml",
-      "version": "opam:3.11.0",
-      "source": {
-        "type": "install",
-        "source": [
-          "archive:https://opam.ocaml.org/cache/sha256/15/158dafe7271ac79157981d1c3f5f177ec78a0099c38f861ae14e7ac06bd29c3a#sha256:158dafe7271ac79157981d1c3f5f177ec78a0099c38f861ae14e7ac06bd29c3a",
-          "archive:https://github.com/ocsigen/js_of_ocaml/releases/download/3.11.0/js_of_ocaml-3.11.0.tbz#sha256:158dafe7271ac79157981d1c3f5f177ec78a0099c38f861ae14e7ac06bd29c3a"
-        ],
-        "opam": {
-          "name": "js_of_ocaml",
-          "version": "3.11.0",
-          "path": "esy.lock/opam/js_of_ocaml.3.11.0"
-        }
-      },
-      "overrides": [],
-      "dependencies": [
-        "ocaml@4.13.1000@d41d8cd9", "@opam/uchar@opam:0.0.2@aedf91f9",
-        "@opam/ppxlib@opam:0.25.0@8553d2e8",
-        "@opam/js_of_ocaml-compiler@opam:3.11.0@6004d7b8",
-        "@opam/dune@opam:2.9.3@f57a6d69", "@esy-ocaml/substs@0.0.1@d41d8cd9"
-      ],
-      "devDependencies": [
-        "ocaml@4.13.1000@d41d8cd9", "@opam/uchar@opam:0.0.2@aedf91f9",
-        "@opam/ppxlib@opam:0.25.0@8553d2e8",
-        "@opam/js_of_ocaml-compiler@opam:3.11.0@6004d7b8",
-        "@opam/dune@opam:2.9.3@f57a6d69"
-      ]
-    },
     "@opam/fpath@opam:0.7.3@674d8125": {
       "id": "@opam/fpath@opam:0.7.3@674d8125",
       "name": "@opam/fpath",
@@ -1319,14 +1233,14 @@
       ],
       "devDependencies": [ "ocaml@4.13.1000@d41d8cd9" ]
     },
-    "@grain/libbinaryen@104.0.0@d41d8cd9": {
-      "id": "@grain/libbinaryen@104.0.0@d41d8cd9",
+    "@grain/libbinaryen@105.1.0@d41d8cd9": {
+      "id": "@grain/libbinaryen@105.1.0@d41d8cd9",
       "name": "@grain/libbinaryen",
-      "version": "104.0.0",
+      "version": "105.1.0",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://registry.npmjs.org/@grain/libbinaryen/-/libbinaryen-104.0.0.tgz#sha1:822bade4f4c6dc9cedbb642e9ead6456be4503bb"
+          "archive:https://registry.npmjs.org/@grain/libbinaryen/-/libbinaryen-105.1.0.tgz#sha1:ed69f20fbe6dee06eb3fd02c2ffb2e2df7c36115"
         ]
       },
       "overrides": [],
@@ -1351,11 +1265,9 @@
       "overrides": [],
       "dependencies": [
         "ocaml@4.13.1000@d41d8cd9",
-        "@opam/js_of_ocaml-ppx@opam:3.11.0@4edaf441",
-        "@opam/js_of_ocaml@opam:3.11.0@93e18d4d",
         "@opam/dune-configurator@opam:2.9.3@174e411b",
         "@opam/dune@opam:2.9.3@f57a6d69",
-        "@grain/libbinaryen@104.0.0@d41d8cd9"
+        "@grain/libbinaryen@105.1.0@d41d8cd9"
       ],
       "devDependencies": [
         "@opam/ocamlformat@opam:0.20.1@30a05b69",

binaryen-archive/package.json

@@ -1,16 +1,14 @@
 {
   "name": "@grain/binaryen.ml",
-  "version": "0.14.1",
+  "version": "0.15.0",
   "description": "OCaml bindings for Binaryen.",
   "author": "Oscar Spencer <oscar@grain-lang.org>",
   "license": "Apache-2.0",
   "dependencies": {
     "ocaml": ">= 4.12.0",
-    "@grain/libbinaryen": ">= 104.0.0 < 105.0.0",
+    "@grain/libbinaryen": ">= 105.1.0 < 106.0.0",
     "@opam/dune": ">= 2.9.1 < 3.0.0",
-    "@opam/dune-configurator": ">= 2.9.1 < 3.0.0",
-    "@opam/js_of_ocaml": ">= 3.10.0 < 4.0.0",
-    "@opam/js_of_ocaml-ppx": ">= 3.10.0 < 4.0.0"
+    "@opam/dune-configurator": ">= 2.9.1 < 3.0.0"
   },
   "devDependencies": {
     "@opam/js_of_ocaml-compiler": ">= 3.10.0 < 4.0.0",

binaryen-archive/src/binaryen_stubs_exports.js

@@ -0,0 +1,110 @@
+//Provides: caml_binaryen_add_function_export
+//Requires: caml_jsstring_of_string
+function caml_binaryen_add_function_export(wasm_mod, internal_name, external_name) {
+  return wasm_mod.addFunctionExport(
+    caml_jsstring_of_string(internal_name),
+    caml_jsstring_of_string(external_name)
+  );
+}
+
+//Provides: caml_binaryen_add_table_export
+//Requires: caml_jsstring_of_string
+function caml_binaryen_add_table_export(wasm_mod, internal_name, external_name) {
+  return wasm_mod.addTableExport(
+    caml_jsstring_of_string(internal_name),
+    caml_jsstring_of_string(external_name)
+  );
+}
+
+//Provides: caml_binaryen_add_memory_export
+//Requires: caml_jsstring_of_string
+function caml_binaryen_add_memory_export(wasm_mod, internal_name, external_name) {
+  return wasm_mod.addMemoryExport(
+    caml_jsstring_of_string(internal_name),
+    caml_jsstring_of_string(external_name)
+  );
+}
+
+//Provides: caml_binaryen_add_global_export
+//Requires: caml_jsstring_of_string
+function caml_binaryen_add_global_export(wasm_mod, internal_name, external_name) {
+  return wasm_mod.addGlobalExport(
+    caml_jsstring_of_string(internal_name),
+    caml_jsstring_of_string(external_name)
+  );
+}
+
+//Provides: caml_binaryen_get_export
+//Requires: caml_jsstring_of_string
+function caml_binaryen_get_export(wasm_mod, external_name) {
+  return wasm_mod.getExport(caml_jsstring_of_string(external_name));
+}
+
+//Provides: caml_binaryen_remove_export
+//Requires: caml_jsstring_of_string
+function caml_binaryen_remove_export(wasm_mod, external_name) {
+  return wasm_mod.removeExport(caml_jsstring_of_string(external_name));
+}
+
+//Provides: caml_binaryen_get_num_exports
+function caml_binaryen_get_num_exports(wasm_mod) {
+  return wasm_mod.getNumExports();
+}
+
+//Provides: caml_binaryen_get_export_by_index
+function caml_binaryen_get_export_by_index(wasm_mod, index) {
+  return wasm_mod.getExportByIndex(index);
+}
+
+//Provides: caml_binaryen_export_get_name
+//Requires: binaryen
+//Requires: caml_string_of_jsstring
+function caml_binaryen_export_get_name(exp) {
+  var export_info = binaryen.getExportInfo(exp);
+  return caml_string_of_jsstring(export_info.name);
+}
+
+//Provides: caml_binaryen_export_get_value
+//Requires: binaryen
+//Requires: caml_string_of_jsstring
+function caml_binaryen_export_get_value(exp) {
+  var export_info = binaryen.getExportInfo(exp);
+  return caml_string_of_jsstring(export_info.value);
+}
+
+//Provides: caml_binaryen_external_function
+//Requires: binaryen
+function caml_binaryen_external_function() {
+  return binaryen._BinaryenExternalFunction();
+}
+
+//Provides: caml_binaryen_external_table
+//Requires: binaryen
+function caml_binaryen_external_table() {
+  return binaryen._BinaryenExternalTable();
+}
+
+//Provides: caml_binaryen_external_memory
+//Requires: binaryen
+function caml_binaryen_external_memory() {
+  return binaryen._BinaryenExternalMemory();
+}
+
+//Provides: caml_binaryen_external_global
+//Requires: binaryen
+function caml_binaryen_external_global() {
+  return binaryen._BinaryenExternalGlobal();
+}
+
+//Provides: caml_binaryen_external_tag
+//Requires: binaryen
+function caml_binaryen_external_tag() {
+  return binaryen._BinaryenExternalTag();
+}
+
+//Provides: caml_binaryen_export_get_kind
+//Requires: binaryen
+function caml_binaryen_export_get_kind(exp) {
+  var export_info = binaryen.getExportInfo(exp);
+  return export_info.kind;
+}