Wasm_of_ocaml: clean up + small fixes (#1836)

* Rename module Wa_runtime to Runtime_files

* Fix: do not wrap twice fragment invocations

* Wasm linker: fix parsing of limits

Author: vouillon

compiler/bin-wasm_of_ocaml/compile.ml

@@ -91,7 +91,7 @@ let link_and_optimize
   let enable_source_maps = Option.is_some opt_sourcemap_file in
   Fs.with_intermediate_file (Filename.temp_file "runtime" ".wasm")
   @@ fun runtime_file ->
-  Fs.write_file ~name:runtime_file ~contents:Wa_runtime.wasm_runtime;
+  Fs.write_file ~name:runtime_file ~contents:Runtime_files.wasm_runtime;
   Fs.with_intermediate_file (Filename.temp_file "wasm-merged" ".wasm")
   @@ fun temp_file ->
   opt_with
@@ -113,7 +113,7 @@ let link_and_optimize
   @@ fun opt_temp_sourcemap' ->
   let primitives =
     Binaryen.dead_code_elimination
-      ~dependencies:Wa_runtime.dependencies
+      ~dependencies:Runtime_files.dependencies
       ~opt_input_sourcemap:opt_temp_sourcemap
       ~opt_output_sourcemap:opt_temp_sourcemap'
       ~input_file:temp_file
@@ -133,7 +133,7 @@ let link_and_optimize
 let link_runtime ~profile runtime_wasm_files output_file =
   Fs.with_intermediate_file (Filename.temp_file "runtime" ".wasm")
   @@ fun runtime_file ->
-  Fs.write_file ~name:runtime_file ~contents:Wa_runtime.wasm_runtime;
+  Fs.write_file ~name:runtime_file ~contents:Runtime_files.wasm_runtime;
   Fs.with_intermediate_file (Filename.temp_file "wasm-merged" ".wasm")
   @@ fun temp_file ->
   Binaryen.link
@@ -216,7 +216,7 @@ let build_js_runtime ~primitives ?runtime_arguments () =
   in
   let prelude = Link.output_js always_required_js in
   let init_fun =
-    match Parse_js.parse (Parse_js.Lexer.of_string Wa_runtime.js_runtime) with
+    match Parse_js.parse (Parse_js.Lexer.of_string Runtime_files.js_runtime) with
     | [ (Expression_statement f, _) ] -> f
     | _ -> assert false
   in

compiler/bin-wasm_of_ocaml/dune

@@ -22,7 +22,7 @@
   (:standard -safe-string)))
 
 (rule
- (target wa_runtime.ml)
+ (target runtime_files.ml)
  (deps
   gen/gen.exe
   ../../runtime/wasm/runtime.wasm

compiler/lib-wasm/gc_target.ml

@@ -1406,11 +1406,6 @@ let () =
   in
   let register_js_expr prim_name =
     register prim_name (fun transl_prim_arg l ->
-        let* wrap =
-          register_import
-            ~name:"wrap"
-            (Fun { params = [ JavaScript.anyref ]; result = [ Value.value ] })
-        in
         match l with
         | Code.[ Pc (String str) ] -> (
             try
@@ -1422,8 +1417,7 @@ let () =
                     EArrow
                       (J.fun_ [] [ Return_statement (Some e, N), N ] N, true, AUnknown))
               in
-              let* js_val = JavaScript.invoke_fragment name [] in
-              return (W.Call (wrap, [ js_val ]))
+              JavaScript.invoke_fragment name []
             with Parse_js.Parsing_error pi ->
               failwith
                 (Printf.sprintf

compiler/lib-wasm/wasm_link.ml

@@ -1402,7 +1402,7 @@ module Scan = struct
     let limits pos =
       let c = get pos in
       assert (c < 8);
-      if c land 1 = 0 then pos |> int else pos |> int |> int
+      if c land 1 = 0 then pos + 1 |> int else pos + 1 |> int |> int
     in
     let tabletype pos =
       mark pos;