@grain/binaryen.ml 0.18.0 → 0.20.0

binaryen-archive/esy.lock/opam/{ppxlib.0.27.0 → ppxlib.0.28.0}/opam

@@ -24,7 +24,7 @@ depends: [
   "ocaml-compiler-libs" {>= "v0.11.0"}
   "ppx_derivers" {>= "1.0"}
   "sexplib0" {>= "v0.12"}
-  "sexplib0" {with-test & < "v0.15"}
+  "sexplib0" {with-test & >= "v0.15"}
   "stdlib-shims"
   "ocamlfind" {with-test}
   "re" {with-test & >= "1.9.0"}
@@ -54,10 +54,10 @@ build: [
 dev-repo: "git+https://github.com/ocaml-ppx/ppxlib.git"
 url {
   src:
-    "https://github.com/ocaml-ppx/ppxlib/releases/download/0.27.0/ppxlib-0.27.0.tbz"
+    "https://github.com/ocaml-ppx/ppxlib/releases/download/0.28.0/ppxlib-0.28.0.tbz"
   checksum: [
-    "sha256=764b96121d6ffd6a73820e0ec5235176bfc42b94cf2ff97e32d068a5c4b28c62"
-    "sha512=2dcce0be6acdb3e185bfdad2785303a405c617f99949316abe6793f785d7227c10795ca49e79290bd385873da635191b44e8a5c211de114a168846d5d26f505c"
+    "sha256=d87ae5f9a081206308ca964809b50a66aeb8e83d254801e8b9675448b60cf377"
+    "sha512=03270d43e91485e63c7dc115a71933ffd8cb2910c273d605d2800fa69f523dcd4de1fbe31fd6c2f6979675c681343bcf4e35be06934565bf28edf4ea03f5da8e"
   ]
 }
-x-commit-hash: "c33c48981a30359af5b4cddaeb633060c1784d62"
+x-commit-hash: "e027461818a8580e860e59d90ccae28f25cd40d4"

binaryen-archive/esy.lock/opam/{sexplib0.v0.14.0 → sexplib0.v0.15.1}/opam

@@ -10,7 +10,7 @@ build: [
   ["dune" "build" "-p" name "-j" jobs]
 ]
 depends: [
-  "ocaml" {>= "4.04.2" & < "5.0"}
+  "ocaml" {>= "4.08"}
   "dune"  {>= "2.0.0"}
 ]
 synopsis: "Library containing the definition of S-expressions and some base converters"
@@ -21,6 +21,6 @@ OCaml's standard library that was developed by Jane Street, the
 largest industrial user of OCaml.
 "
 url {
-  src: "https://ocaml.janestreet.com/ocaml-core/v0.14/files/sexplib0-v0.14.0.tar.gz"
-  checksum: "md5=37aff0af8f8f6f759249475684aebdc4"
+src: "https://github.com/janestreet/sexplib0/archive/refs/tags/v0.15.1.tar.gz"
+checksum: "md5=ab8fd6273f35a792cad48cbb3024a7f9"
 }

binaryen-archive/esy.lock/opam/{stdio.v0.14.0 → stdio.v0.15.0}/opam

@@ -10,8 +10,8 @@ build: [
   ["dune" "build" "-p" name "-j" jobs]
 ]
 depends: [
-  "ocaml" {>= "4.04.2"}
-  "base"  {>= "v0.14" & < "v0.15"}
+  "ocaml" {>= "4.08.0"}
+  "base"  {>= "v0.15" & < "v0.16"}
   "dune"  {>= "2.0.0"}
 ]
 synopsis: "Standard IO library for OCaml"
@@ -22,6 +22,6 @@ It re-exports the input/output functions of the OCaml standard
 libraries using a more consistent API.
 "
 url {
-  src: "https://ocaml.janestreet.com/ocaml-core/v0.14/files/stdio-v0.14.0.tar.gz"
-  checksum: "md5=4cbdf15f0be88c3258aaeff9e04e00e9"
+src: "https://ocaml.janestreet.com/ocaml-core/v0.15/files/stdio-v0.15.0.tar.gz"
+checksum: "sha256=c37292921dc6a88425f773eba6bdbeac1dedacd1f55917fa4bcd9c4b25795e4b"
 }

binaryen-archive/esy.lock/opam/{stdune.3.3.1 → stdune.3.6.1}/opam

@@ -9,7 +9,7 @@ homepage: "https://github.com/ocaml/dune"
 doc: "https://dune.readthedocs.io/"
 bug-reports: "https://github.com/ocaml/dune/issues"
 depends: [
-  "dune" {>= "3.3"}
+  "dune" {>= "3.5"}
   "ocaml" {>= "4.08.0"}
   "base-unix"
   "dyn" {= version}
@@ -35,10 +35,10 @@ build: [
   ]
 ]
 url {
-  src: "https://github.com/ocaml/dune/releases/download/3.3.1/dune-3.3.1.tbz"
+  src: "https://github.com/ocaml/dune/releases/download/3.6.1/dune-3.6.1.tbz"
   checksum: [
-    "sha256=840c80491bfe12bab5f2b99d49e163f3e4c4d2fc4b4a3e6fb16c24dccd5502e1"
-    "sha512=b5d7639336b5df8cf37b8aac45906c6d0ff7e38b1a4a2c6ddb616ea81cdc5a8ff36cecf3d4ee4ff9282c835ed2958d4702ae1b3dd1f048c4269f5e7fedbe50d5"
+    "sha256=f1d5ac04b7a027f3d549e25cf885ebf7acc135e0291c18e6b43123a799c143ce"
+    "sha512=64714ab6155cd04bc33d693fc7a6d9d61aa7a278357eeff159df324e083914fcd556459a3945acacf1bbc3775f2232ab0c78006ab8a434dc58dcf95ffdffac52"
   ]
 }
-x-commit-hash: "b3232b22e13ff2fe4db994ba7ae3db727d1493cd"
+x-commit-hash: "7d2788fc94a071bca897aefc95f1464911870a4c"

binaryen-archive/esy.lock/opam/{topkg.1.0.5 → topkg.1.0.6}/opam

@@ -1,22 +1,6 @@
 opam-version: "2.0"
-synopsis: """The transitory OCaml software packager"""
-maintainer: ["Daniel Bünzli <daniel.buenzl i@erratique.ch>"]
-authors: ["The topkg programmers"]
-homepage: "https://erratique.ch/software/topkg"
-doc: "https://erratique.ch/software/topkg/doc"
-dev-repo: "git+https://erratique.ch/repos/topkg.git"
-bug-reports: "https://github.com/dbuenzli/topkg/issues"
-license: ["ISC"]
-tags: ["packaging" "ocamlbuild" "org:erratique"]
-depends: ["ocaml" {>= "4.05.0"}
-          "ocamlfind" {build & >= "1.6.1"}
-          "ocamlbuild"]
-build: [["ocaml" "pkg/pkg.ml" "build" "--pkg-name" name
-                                      "--dev-pkg" "%{dev}%"]]
-url {
-  src: "https://erratique.ch/software/topkg/releases/topkg-1.0.5.tbz"
-  checksum: "sha512=9450e9139209aacd8ddb4ba18e4225770837e526a52a56d94fd5c9c4c9941e83e0e7102e2292b440104f4c338fabab47cdd6bb51d69b41cc92cc7a551e6fefab"}
-description: """
+synopsis: "The transitory OCaml software packager"
+description: """\
 Topkg is a packager for distributing OCaml software. It provides an
 API to describe the files a package installs in a given build
 configuration and to specify information about the package's
@@ -41,4 +25,23 @@ Topkg-care is distributed under the ISC license it depends on
 [cmdliner]: http://erratique.ch/software/cmdliner
 [webbrowser]: http://erratique.ch/software/webbrowser
 
-Home page: http://erratique.ch/software/topkg"""
+Home page: http://erratique.ch/software/topkg"""
+maintainer: "Daniel Bünzli <daniel.buenzl i@erratique.ch>"
+authors: "The topkg programmers"
+license: "ISC"
+tags: ["packaging" "ocamlbuild" "org:erratique"]
+homepage: "https://erratique.ch/software/topkg"
+doc: "https://erratique.ch/software/topkg/doc"
+bug-reports: "https://github.com/dbuenzli/topkg/issues"
+depends: [
+  "ocaml" {>= "4.05.0"}
+  "ocamlfind" {build & >= "1.6.1"}
+  "ocamlbuild"
+]
+build: ["ocaml" "pkg/pkg.ml" "build" "--pkg-name" name "--dev-pkg" "%{dev}%"]
+dev-repo: "git+https://erratique.ch/repos/topkg.git"
+url {
+  src: "https://erratique.ch/software/topkg/releases/topkg-1.0.6.tbz"
+  checksum:
+    "sha512=8e34391e2f499cec332b79454a4edb36a35db6fe22437f017fd5c80ae065160dc967ac02d894a94d08d62dd476521e63733f4cadc3b9b6b314b6aa5b2b4ede78"
+}

binaryen-archive/esy.lock/opam/uucp.15.0.0/opam

@@ -0,0 +1,55 @@
+opam-version: "2.0"
+synopsis: "Unicode character properties for OCaml"
+description: """\
+Uucp is an OCaml library providing efficient access to a selection of
+character properties of the [Unicode character database][1].
+
+Uucp is independent from any Unicode text data structure and has no
+dependencies. It is distributed under the ISC license.
+
+[1]: http://www.unicode.org/reports/tr44/
+
+Home page: http://erratique.ch/software/uucp"""
+maintainer: "Daniel Bünzli <daniel.buenzl i@erratique.ch>"
+authors: "The uucp programmers"
+license: "ISC"
+tags: ["unicode" "text" "character" "org:erratique"]
+homepage: "https://erratique.ch/software/uucp"
+doc: "https://erratique.ch/software/uucp/doc/"
+bug-reports: "https://github.com/dbuenzli/uucp/issues"
+depends: [
+  "ocaml" {>= "4.03.0"}
+  "ocamlfind" {build}
+  "ocamlbuild" {build}
+  "topkg" {build & >= "1.0.3"}
+  "uucd" {with-test}
+  "uunf" {with-test}
+  "uutf" {with-test}
+]
+depopts: ["uutf" "uunf" "cmdliner"]
+conflicts: [
+  "uutf" {< "1.0.1"}
+  "cmdliner" {< "1.1.0"}
+]
+build: [
+  "ocaml"
+  "pkg/pkg.ml"
+  "build"
+  "--dev-pkg"
+  "%{dev}%"
+  "--with-uutf"
+  "%{uutf:installed}%"
+  "--with-uunf"
+  "%{uunf:installed}%"
+  "--with-cmdliner"
+  "%{cmdliner:installed}%"
+]
+post-messages:
+  "If the build fails with \"ocamlopt.opt got signal and exited\", issue 'ulimit -s unlimited' and retry."
+    {failure & (arch = "ppc64" | arch = "arm64")}
+dev-repo: "git+https://erratique.ch/repos/uucp.git"
+url {
+  src: "https://erratique.ch/software/uucp/releases/uucp-15.0.0.tbz"
+  checksum:
+    "sha512=ee4acff5666961766321e85e287fb9d5b8d50533319f22bf6f4eceb943242df2d0e0f4e775c4a140f68ca142837938eaa5926e22362215a3365ffe7f8768923b"
+}

binaryen-archive/esy.lock/opam/{uuseg.14.0.0 → uuseg.15.0.0}/opam

@@ -1,28 +1,6 @@
 opam-version: "2.0"
-synopsis: """Unicode text segmentation for OCaml"""
-maintainer: ["Daniel Bünzli <daniel.buenzl i@erratique.ch>"]
-authors: ["The uuseg programmers"]
-homepage: "https://erratique.ch/software/uuseg"
-doc: "https://erratique.ch/software/uuseg/doc/"
-dev-repo: "git+https://erratique.ch/repos/uuseg.git"
-bug-reports: "https://github.com/dbuenzli/uuseg/issues"
-license: ["ISC"]
-tags: ["unicode" "text" "segmentation" "org:erratique"]
-depends: ["ocaml" {>= "4.03.0"}
-          "ocamlfind" {build}
-          "ocamlbuild" {build}
-          "topkg" {build & >= "1.0.3"}
-          "uucp" {>= "14.0.0" & < "15.0.0"}]
-depopts: ["uutf"
-          "cmdliner"]
-conflicts: ["uutf" {< "1.0.0"}]
-build: [["ocaml" "pkg/pkg.ml" "build" "--dev-pkg" "%{dev}%"
-         "--with-uutf" "%{uutf:installed}%"
-         "--with-cmdliner" "%{cmdliner:installed}%" ]]
-url {
-  src: "https://erratique.ch/software/uuseg/releases/uuseg-14.0.0.tbz"
-  checksum: "sha512=3f089baf95f010663a0c2f060b2911395d9b396f478efb10fd979815f527c9e61e0a70b3192f2e921f59287bfde0da6e25109d4a1825554e2e4a50c0535e97aa"}
-description: """
+synopsis: "Unicode text segmentation for OCaml"
+description: """\
 Uuseg is an OCaml library for segmenting Unicode text. It implements
 the locale independent [Unicode text segmentation algorithms][1] to
 detect grapheme cluster, word and sentence boundaries and the
@@ -40,4 +18,40 @@ OCaml UTF-X encoded strings. It is distributed under the ISC license.
 [1]: http://www.unicode.org/reports/tr29/
 [2]: http://www.unicode.org/reports/tr14/
 
-Homepage: http://erratique.ch/software/uuseg"""
+Homepage: http://erratique.ch/software/uuseg"""
+maintainer: "Daniel Bünzli <daniel.buenzl i@erratique.ch>"
+authors: "The uuseg programmers"
+license: "ISC"
+tags: ["unicode" "text" "segmentation" "org:erratique"]
+homepage: "https://erratique.ch/software/uuseg"
+doc: "https://erratique.ch/software/uuseg/doc/"
+bug-reports: "https://github.com/dbuenzli/uuseg/issues"
+depends: [
+  "ocaml" {>= "4.03.0"}
+  "ocamlfind" {build}
+  "ocamlbuild" {build}
+  "topkg" {build & >= "1.0.3"}
+  "uucp" {>= "15.0.0" & < "16.0.0"}
+]
+depopts: ["uutf" "cmdliner"]
+conflicts: [
+  "uutf" {< "1.0.0"}
+  "cmdliner" {< "1.1.0"}
+]
+build: [
+  "ocaml"
+  "pkg/pkg.ml"
+  "build"
+  "--dev-pkg"
+  "%{dev}%"
+  "--with-uutf"
+  "%{uutf:installed}%"
+  "--with-cmdliner"
+  "%{cmdliner:installed}%"
+]
+dev-repo: "git+https://erratique.ch/repos/uuseg.git"
+url {
+  src: "https://erratique.ch/software/uuseg/releases/uuseg-15.0.0.tbz"
+  checksum:
+    "sha512=37ea83b582dd779a026cfae11f08f5d67ef79fce65a2cf03f2a9aabc7eb5de60c8e812524fa7531e4ff6e22a3b18228e3438a0143ce43be95f23237cc283576f"
+}

binaryen-archive/esy.lock/opam/{xdg.3.3.1 → xdg.3.6.1}/opam

@@ -9,7 +9,7 @@ homepage: "https://github.com/ocaml/dune"
 doc: "https://dune.readthedocs.io/"
 bug-reports: "https://github.com/ocaml/dune/issues"
 depends: [
-  "dune" {>= "3.3"}
+  "dune" {>= "3.5"}
   "ocaml" {>= "4.08"}
   "odoc" {with-doc}
 ]
@@ -30,10 +30,10 @@ build: [
   ]
 ]
 url {
-  src: "https://github.com/ocaml/dune/releases/download/3.3.1/dune-3.3.1.tbz"
+  src: "https://github.com/ocaml/dune/releases/download/3.6.1/dune-3.6.1.tbz"
   checksum: [
-    "sha256=840c80491bfe12bab5f2b99d49e163f3e4c4d2fc4b4a3e6fb16c24dccd5502e1"
-    "sha512=b5d7639336b5df8cf37b8aac45906c6d0ff7e38b1a4a2c6ddb616ea81cdc5a8ff36cecf3d4ee4ff9282c835ed2958d4702ae1b3dd1f048c4269f5e7fedbe50d5"
+    "sha256=f1d5ac04b7a027f3d549e25cf885ebf7acc135e0291c18e6b43123a799c143ce"
+    "sha512=64714ab6155cd04bc33d693fc7a6d9d61aa7a278357eeff159df324e083914fcd556459a3945acacf1bbc3775f2232ab0c78006ab8a434dc58dcf95ffdffac52"
   ]
 }
-x-commit-hash: "b3232b22e13ff2fe4db994ba7ae3db727d1493cd"
+x-commit-hash: "7d2788fc94a071bca897aefc95f1464911870a4c"

binaryen-archive/esy.lock/opam/{yojson.2.0.0 → yojson.2.0.2}/opam

@@ -14,7 +14,7 @@ build: [
 ]
 depends: [
   "ocaml" {>= "4.02.3"}
-  "dune"
+  "dune" {>= "2.0"}
   "cppo" {build}
   "alcotest" {with-test & >= "0.8.5"}
   "odoc" {with-doc}
@@ -29,10 +29,10 @@ ydump is a pretty-printing command-line program provided with the
 yojson package."""
 url {
   src:
-    "https://github.com/ocaml-community/yojson/releases/download/2.0.0/yojson-2.0.0.tbz"
+    "https://github.com/ocaml-community/yojson/releases/download/2.0.2/yojson-2.0.2.tbz"
   checksum: [
-    "sha256=ab5d863f7f951a8f7fb4a708399ca2da2cf139a5e0af7818145c20295420cb1a"
-    "sha512=3ea982dbeef7ec8da54d29124ddb8b86f90583eb96ed3947851cedec9e3d2d47b981e3465d41f2c94943e6865ba6a9a51c6f0252efa6df2386d398b679aae8f2"
+    "sha256=876bb6f38af73a84a29438a3da35e4857c60a14556a606525b148c6fdbe5461b"
+    "sha512=9e150689a814a64e53e361e336fe826df5a3e3851d1367fda4a001392175c29348de55db0b7d7ba18539dec2cf78198efcb7f41b77a9861763f5aa97c05509ad"
   ]
 }
-x-commit-hash: "9c5cee131ae0ec79713e62397076d597486844ed"
+x-commit-hash: "17ca03c5877a4346f0691443f35ed9678f99962f"

binaryen-archive/package.json

@@ -1,19 +1,19 @@
 {
   "name": "@grain/binaryen.ml",
-  "version": "0.18.0",
+  "version": "0.20.0",
   "description": "OCaml bindings for Binaryen.",
   "author": "Oscar Spencer <oscar@grain-lang.org>",
   "license": "Apache-2.0",
   "dependencies": {
     "ocaml": ">= 4.12.0",
-    "@grain/libbinaryen": ">= 108.0.0 < 109.0.0",
-    "@opam/dune": ">= 2.9.1",
-    "@opam/dune-configurator": ">= 2.9.1"
+    "@grain/libbinaryen": ">= 110.0.0 < 111.0.0",
+    "@opam/dune": ">= 3.0.0",
+    "@opam/dune-configurator": ">= 3.0.0"
   },
   "devDependencies": {
-    "@opam/js_of_ocaml-compiler": ">= 3.10.0",
-    "@opam/ocamlformat": "0.20.1",
-    "@opam/ocaml-lsp-server": "^1.9.1"
+    "@opam/js_of_ocaml-compiler": ">= 4.1.0 < 5.0.0",
+    "@opam/ocamlformat": "0.24.1",
+    "@opam/ocaml-lsp-server": ">= 1.9.1 < 1.13.0"
   },
   "resolutions": {
     "@opam/ocp-indent": "1.7.0"
@@ -22,7 +22,7 @@
     "build": "dune build -p binaryen"
   },
   "scripts": {
-    "test": "esy b dune runtest",
+    "test": "esy b dune runtest --display=short",
     "format": "dune build @fmt --auto-promote"
   },
   "installConfig": {

binaryen-archive/src/binaryen_stubs_expressions.c

@@ -224,9 +224,9 @@ caml_binaryen_global_set(value _module, value _name, value _val) {
 }
 
 CAMLprim value
-caml_binaryen_load(value _module, value _bytes, value _signed_, value _offset, value _align, value _ty, value _ptr) {
+caml_binaryen_load(value _module, value _bytes, value _signed_, value _offset, value _align, value _ty, value _ptr, value _memoryName) {
   CAMLparam5(_module, _bytes, _signed_, _offset, _align);
-  CAMLxparam2(_ty, _ptr);
+  CAMLxparam3(_ty, _ptr, _memoryName);
   BinaryenModuleRef module = BinaryenModuleRef_val(_module);
   int bytes = Int_val(_bytes);
   int8_t signed_ = Bool_val(_signed_);
@@ -234,18 +234,19 @@ caml_binaryen_load(value _module, value _bytes, value _signed_, value _offset, v
   int align = Int_val(_align);
   BinaryenType ty = BinaryenType_val(_ty);
   BinaryenExpressionRef ptr = BinaryenExpressionRef_val(_ptr);
-  BinaryenExpressionRef exp = BinaryenLoad(module, bytes, signed_, offset, align, ty, ptr);
+  char* memoryName = Safe_String_val(_memoryName);
+  BinaryenExpressionRef exp = BinaryenLoad(module, bytes, signed_, offset, align, ty, ptr, memoryName);
   CAMLreturn(alloc_BinaryenExpressionRef(exp));
 }
 CAMLprim value
 caml_binaryen_load__bytecode(value * argv) {
-  return caml_binaryen_load(argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6]);
+  return caml_binaryen_load(argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7]);
 }
 
 CAMLprim value
-caml_binaryen_store(value _module, value _bytes, value _offset, value _align, value _ptr, value _val, value _ty) {
+caml_binaryen_store(value _module, value _bytes, value _offset, value _align, value _ptr, value _val, value _ty, value _memoryName) {
   CAMLparam5(_module, _bytes, _offset, _align, _ptr);
-  CAMLxparam2(_val, _ty);
+  CAMLxparam3(_val, _ty, _memoryName);
   BinaryenModuleRef module = BinaryenModuleRef_val(_module);
   int bytes = Int_val(_bytes);
   int offset = Int_val(_offset);
@@ -253,12 +254,13 @@ caml_binaryen_store(value _module, value _bytes, value _offset, value _align, va
   BinaryenExpressionRef ptr = BinaryenExpressionRef_val(_ptr);
   BinaryenExpressionRef val = BinaryenExpressionRef_val(_val);
   BinaryenType ty = BinaryenType_val(_ty);
-  BinaryenExpressionRef exp = BinaryenStore(module, bytes, offset, align, ptr, val, ty);
+  char* memoryName = Safe_String_val(_memoryName);
+  BinaryenExpressionRef exp = BinaryenStore(module, bytes, offset, align, ptr, val, ty, memoryName);
   CAMLreturn(alloc_BinaryenExpressionRef(exp));
 }
 CAMLprim value
 caml_binaryen_store__bytecode(value * argv) {
-  return caml_binaryen_store(argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6]);
+  return caml_binaryen_store(argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7]);
 }
 
 CAMLprim value
@@ -322,19 +324,23 @@ caml_binaryen_return(value _module, value _p1) {
 }
 
 CAMLprim value
-caml_binaryen_memory_size(value _module) {
-  CAMLparam1(_module);
+caml_binaryen_memory_size(value _module, value _memoryName, value _memoryIs64) {
+  CAMLparam3(_module, _memoryName, _memoryIs64);
   BinaryenModuleRef module = BinaryenModuleRef_val(_module);
-  BinaryenExpressionRef exp = BinaryenMemorySize(module);
+  char* memoryName = Safe_String_val(_memoryName);
+  bool memoryIs64 = Bool_val(_memoryIs64);
+  BinaryenExpressionRef exp = BinaryenMemorySize(module, memoryName, memoryIs64);
   CAMLreturn(alloc_BinaryenExpressionRef(exp));
 }
 
 CAMLprim value
-caml_binaryen_memory_grow(value _module, value _p1) {
-  CAMLparam2(_module, _p1);
+caml_binaryen_memory_grow(value _module, value _delta, value _memoryName, value _memoryIs64) {
+  CAMLparam4(_module, _delta, _memoryName, _memoryIs64);
   BinaryenModuleRef module = BinaryenModuleRef_val(_module);
-  BinaryenExpressionRef p1 = BinaryenExpressionRef_val(_p1);
-  BinaryenExpressionRef exp = BinaryenMemoryGrow(module, p1);
+  BinaryenExpressionRef delta = BinaryenExpressionRef_val(_delta);
+  char* memoryName = Safe_String_val(_memoryName);
+  bool memoryIs64 = Bool_val(_memoryIs64);
+  BinaryenExpressionRef exp = BinaryenMemoryGrow(module, delta, memoryName, memoryIs64);
   CAMLreturn(alloc_BinaryenExpressionRef(exp));
 }
 
@@ -355,16 +361,22 @@ caml_binaryen_unreachable(value _module) {
 }
 
 CAMLprim value
-caml_binaryen_memory_init(value _module, value _segment, value _dest, value _offset, value _size) {
+caml_binaryen_memory_init(value _module, value _segment, value _dest, value _offset, value _size, value _memoryName) {
   CAMLparam5(_module, _segment, _dest, _offset, _size);
+  CAMLxparam1(_memoryName);
   BinaryenModuleRef module = BinaryenModuleRef_val(_module);
   uint32_t segment = Int_val(_segment);
   BinaryenExpressionRef dest = BinaryenExpressionRef_val(_dest);
   BinaryenExpressionRef offset = BinaryenExpressionRef_val(_offset);
   BinaryenExpressionRef size = BinaryenExpressionRef_val(_size);
-  BinaryenExpressionRef exp = BinaryenMemoryInit(module, segment, dest, offset, size);
+  char* memoryName = Safe_String_val(_memoryName);
+  BinaryenExpressionRef exp = BinaryenMemoryInit(module, segment, dest, offset, size, memoryName);
   CAMLreturn(alloc_BinaryenExpressionRef(exp));
 }
+CAMLprim value
+caml_binaryen_memory_init__bytecode(value * argv) {
+  return caml_binaryen_memory_init(argv[0], argv[1], argv[2], argv[3], argv[4], argv[5]);
+}
 
 CAMLprim value
 caml_binaryen_data_drop(value _module, value _segment) {
@@ -376,24 +388,32 @@ caml_binaryen_data_drop(value _module, value _segment) {
 }
 
 CAMLprim value
-caml_binaryen_memory_copy(value _module, value _dest, value _source, value _size) {
-  CAMLparam4(_module, _dest, _source, _size);
+caml_binaryen_memory_copy(value _module, value _dest, value _source, value _size, value _destMemory, value _sourceMemory) {
+  CAMLparam5(_module, _dest, _source, _size, _destMemory);
+  CAMLxparam1(_sourceMemory);
   BinaryenModuleRef module = BinaryenModuleRef_val(_module);
   BinaryenExpressionRef dest = BinaryenExpressionRef_val(_dest);
   BinaryenExpressionRef source = BinaryenExpressionRef_val(_source);
   BinaryenExpressionRef size = BinaryenExpressionRef_val(_size);
-  BinaryenExpressionRef exp = BinaryenMemoryCopy(module, dest, source, size);
+  char* destMemory = Safe_String_val(_destMemory);
+  char* sourceMemory = Safe_String_val(_sourceMemory);
+  BinaryenExpressionRef exp = BinaryenMemoryCopy(module, dest, source, size, destMemory, sourceMemory);
   CAMLreturn(alloc_BinaryenExpressionRef(exp));
 }
+CAMLprim value
+caml_binaryen_memory_copy__bytecode(value * argv) {
+  return caml_binaryen_memory_copy(argv[0], argv[1], argv[2], argv[3], argv[4], argv[5]);
+}
 
 CAMLprim value
-caml_binaryen_memory_fill(value _module, value _dest, value _val, value _size) {
-  CAMLparam4(_module, _dest, _val, _size);
+caml_binaryen_memory_fill(value _module, value _dest, value _val, value _size, value _memoryName) {
+  CAMLparam5(_module, _dest, _val, _size, _memoryName);
   BinaryenModuleRef module = BinaryenModuleRef_val(_module);
   BinaryenExpressionRef dest = BinaryenExpressionRef_val(_dest);
   BinaryenExpressionRef val = BinaryenExpressionRef_val(_val);
   BinaryenExpressionRef size = BinaryenExpressionRef_val(_size);
-  BinaryenExpressionRef exp = BinaryenMemoryFill(module, dest, val, size);
+  char* memoryName = Safe_String_val(_memoryName);
+  BinaryenExpressionRef exp = BinaryenMemoryFill(module, dest, val, size, memoryName);
   CAMLreturn(alloc_BinaryenExpressionRef(exp));
 }
 
@@ -717,16 +737,6 @@ caml_binaryen_expression_id_br_on(value unit) {
   CAMLreturn(Val_int(BinaryenBrOnId()));
 }
 CAMLprim value
-caml_binaryen_expression_id_rtt_canon(value unit) {
-  CAMLparam1(unit);
-  CAMLreturn(Val_int(BinaryenRttCanonId()));
-}
-CAMLprim value
-caml_binaryen_expression_id_rtt_sub(value unit) {
-  CAMLparam1(unit);
-  CAMLreturn(Val_int(BinaryenRttSubId()));
-}
-CAMLprim value
 caml_binaryen_expression_id_struct_new(value unit) {
   CAMLparam1(unit);
   CAMLreturn(Val_int(BinaryenStructNewId()));