Merge pull request #33 from grain-lang/fix-breaking-binaryen-changes

Update bindings for breaking changes

Author: phated

js/expression.ml

@@ -145,6 +145,11 @@ let drop wasm_mod value = meth_call wasm_mod "drop" [| inject value |]
 
 let return wasm_mod value = meth_call wasm_mod "return" [| inject value |]
 
+let memory_grow wasm_mod value =
+  meth_call wasm_mod "memory_grow" [| inject value |]
+
+let memory_size wasm_mod = meth_call wasm_mod "memory_size" [||]
+
 let nop wasm_mod = meth_call wasm_mod "nop" [||]
 
 let unreachable wasm_mod = meth_call wasm_mod "unreachable" [||]

js/type.ml

@@ -19,8 +19,6 @@ let funcref : t = global##.binaryen##.funcref
 
 let externref : t = global##.binaryen##.externref
 
-let nullref : t = global##.binaryen##.nullref
-
 let exnref : t = global##.binaryen##.exnref
 
 let unreachable : t = global##.binaryen##.unreachable

src/binaryen_stubs_expressions.c

@@ -298,6 +298,23 @@ caml_binaryen_return(value _module, value _p1) {
   CAMLreturn(alloc_BinaryenExpressionRef(exp));
 }
 
+CAMLprim value
+caml_binaryen_memory_size(value _module) {
+  CAMLparam1(_module);
+  BinaryenModuleRef module = BinaryenModuleRef_val(_module);
+  BinaryenExpressionRef exp = BinaryenMemorySize(module);
+  CAMLreturn(alloc_BinaryenExpressionRef(exp));
+}
+
+CAMLprim value
+caml_binaryen_memory_grow(value _module, value _p1) {
+  CAMLparam2(_module, _p1);
+  BinaryenModuleRef module = BinaryenModuleRef_val(_module);
+  BinaryenExpressionRef p1 = BinaryenExpressionRef_val(_p1);
+  BinaryenExpressionRef exp = BinaryenMemoryGrow(module, p1);
+  CAMLreturn(alloc_BinaryenExpressionRef(exp));
+}
+
 CAMLprim value
 caml_binaryen_nop(value _module) {
   CAMLparam1(_module);

src/binaryen_stubs_ops.c

@@ -910,20 +910,6 @@ caml_binaryen_binaryen_ge_float64(value unit) {
   CAMLreturn(alloc_BinaryenOp(op));
 }
 
-CAMLprim value
-caml_binaryen_binaryen_memory_size(value unit) {
-  CAMLparam1(unit);
-  BinaryenOp op = BinaryenMemorySize();
-  CAMLreturn(alloc_BinaryenOp(op));
-}
-
-CAMLprim value
-caml_binaryen_binaryen_memory_grow(value unit) {
-  CAMLparam1(unit);
-  BinaryenOp op = BinaryenMemoryGrow();
-  CAMLreturn(alloc_BinaryenOp(op));
-}
-
 CAMLprim value
 caml_binaryen_binaryen_atomic_rmw_add(value unit) {
   CAMLparam1(unit);

src/binaryen_stubs_types.c

@@ -71,13 +71,6 @@ caml_binaryen_type_externref(value unit) {
   CAMLreturn(alloc_BinaryenType(ty));
 }
 
-CAMLprim value
-caml_binaryen_type_nullref(value unit) {
-  CAMLparam1(unit);
-  BinaryenType ty = BinaryenTypeNullref();
-  CAMLreturn(alloc_BinaryenType(ty));
-}
-
 CAMLprim value
 caml_binaryen_type_exnref(value unit) {
   CAMLparam1(unit);

src/expression.ml

@@ -70,6 +70,10 @@ external drop : Module.t -> t -> t = "caml_binaryen_drop"
 
 external return : Module.t -> t -> t = "caml_binaryen_return"
 
+external memory_grow : Module.t -> t -> t = "caml_binaryen_memory_grow"
+
+external memory_size : Module.t -> t = "caml_binaryen_memory_size"
+
 external nop : Module.t -> t = "caml_binaryen_nop"
 
 external unreachable : Module.t -> t = "caml_binaryen_unreachable"

src/op.ml

@@ -537,14 +537,6 @@ external ge_float64 : unit -> t = "caml_binaryen_binaryen_ge_float64"
 
 let ge_float64 = ge_float64 ()
 
-external memory_size : unit -> t = "caml_binaryen_binaryen_memory_size"
-
-let memory_size = memory_size ()
-
-external memory_grow : unit -> t = "caml_binaryen_binaryen_memory_grow"
-
-let memory_grow = memory_grow ()
-
 external atomic_rmw_add : unit -> t = "caml_binaryen_binaryen_atomic_rmw_add"
 
 let atomic_rmw_add = atomic_rmw_add ()

src/type.ml

@@ -32,10 +32,6 @@ external externref : unit -> t = "caml_binaryen_type_externref"
 
 let externref = externref ()
 
-external nullref : unit -> t = "caml_binaryen_type_nullref"
-
-let nullref = nullref ()
-
 external exnref : unit -> t = "caml_binaryen_type_exnref"
 
 let exnref = exnref ()

virtual/expression.mli

@@ -44,6 +44,10 @@ val drop : Module.t -> t -> t
 
 val return : Module.t -> t -> t
 
+val memory_grow : Module.t -> t -> t
+
+val memory_size : Module.t -> t
+
 val nop : Module.t -> t
 
 val unreachable : Module.t -> t

virtual/op.mli

@@ -256,10 +256,6 @@ val gt_float64 : t
 
 val ge_float64 : t
 
-val memory_size : t
-
-val memory_grow : t
-
 val atomic_rmw_add : t
 
 val atomic_rmw_sub : t

virtual/type.mli

@@ -16,8 +16,6 @@ val funcref : t
 
 val externref : t
 
-val nullref : t
-
 val exnref : t
 
 val unreachable : t