Wasm runtime: code reordering

Author: vouillon

runtime/wasm/backtrace.wat

@@ -16,12 +16,12 @@
 ;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 (module
+   (import "fail" "caml_invalid_argument"
+      (func $caml_invalid_argument (param (ref eq))))
    (import "bindings" "backtrace_status"
       (func $backtrace_status (result (ref eq))))
    (import "bindings" "record_backtrace"
       (func $record_backtrace (param (ref eq))))
-   (import "fail" "caml_invalid_argument"
-      (func $caml_invalid_argument (param (ref eq))))
 
    (type $block (array (mut (ref eq))))
    (type $bytes (array (mut i8)))

runtime/wasm/bigarray.wat

@@ -16,6 +16,55 @@
 ;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 (module
+   (import "fail" "caml_bound_error" (func $caml_bound_error))
+   (import "fail" "caml_raise_out_of_memory" (func $caml_raise_out_of_memory))
+   (import "fail" "caml_invalid_argument"
+      (func $caml_invalid_argument (param (ref eq))))
+   (import "fail" "caml_failwith" (func $caml_failwith (param (ref eq))))
+   (import "jslib" "wrap" (func $wrap (param anyref) (result (ref eq))))
+   (import "jslib" "unwrap" (func $unwrap (param (ref eq)) (result anyref)))
+   (import "int32" "caml_copy_int32"
+      (func $caml_copy_int32 (param i32) (result (ref eq))))
+   (import "int32" "Int32_val"
+      (func $Int32_val (param (ref eq)) (result i32)))
+   (import "int32" "caml_copy_nativeint"
+      (func $caml_copy_nativeint (param i32) (result (ref eq))))
+   (import "int64" "caml_copy_int64"
+      (func $caml_copy_int64 (param i64) (result (ref eq))))
+   (import "int64" "Int64_val"
+      (func $Int64_val (param (ref eq)) (result i64)))
+   (import "obj" "double_array_tag" (global $double_array_tag i32))
+   (import "compare" "unordered" (global $unordered i32))
+   (import "hash" "caml_hash_mix_int"
+      (func $caml_hash_mix_int (param i32) (param i32) (result i32)))
+   (import "hash" "caml_hash_mix_int64"
+      (func $caml_hash_mix_int64 (param i32) (param i64) (result i32)))
+   (import "hash" "caml_hash_mix_double"
+      (func $caml_hash_mix_double (param i32) (param f64) (result i32)))
+   (import "hash" "caml_hash_mix_float"
+      (func $caml_hash_mix_float (param i32) (param f32) (result i32)))
+   (import "hash" "caml_hash_mix_float16"
+      (func $caml_hash_mix_float16 (param i32) (param i32) (result i32)))
+   (import "marshal" "caml_serialize_int_1"
+      (func $caml_serialize_int_1 (param (ref eq)) (param i32)))
+   (import "marshal" "caml_serialize_int_2"
+      (func $caml_serialize_int_2 (param (ref eq)) (param i32)))
+   (import "marshal" "caml_serialize_int_4"
+      (func $caml_serialize_int_4 (param (ref eq)) (param i32)))
+   (import "marshal" "caml_serialize_int_8"
+      (func $caml_serialize_int_8 (param (ref eq)) (param i64)))
+   (import "marshal" "caml_deserialize_uint_1"
+      (func $caml_deserialize_uint_1 (param (ref eq)) (result i32)))
+   (import "marshal" "caml_deserialize_sint_1"
+      (func $caml_deserialize_sint_1 (param (ref eq)) (result i32)))
+   (import "marshal" "caml_deserialize_uint_2"
+      (func $caml_deserialize_uint_2 (param (ref eq)) (result i32)))
+   (import "marshal" "caml_deserialize_sint_2"
+      (func $caml_deserialize_sint_2 (param (ref eq)) (result i32)))
+   (import "marshal" "caml_deserialize_int_4"
+      (func $caml_deserialize_int_4 (param (ref eq)) (result i32)))
+   (import "marshal" "caml_deserialize_int_8"
+      (func $caml_deserialize_int_8 (param (ref eq)) (result i64)))
    (import "bindings" "ta_create"
       (func $ta_create (param i32) (param i32) (result (ref extern))))
    (import "bindings" "ta_normalize"
@@ -72,55 +121,6 @@
    (import "bindings" "dv_set_i8"
       (func $dv_set_i8 (param externref i32 i32)))
    (import "bindings" "littleEndian" (global $littleEndian i32))
-   (import "fail" "caml_bound_error" (func $caml_bound_error))
-   (import "fail" "caml_raise_out_of_memory" (func $caml_raise_out_of_memory))
-   (import "fail" "caml_invalid_argument"
-      (func $caml_invalid_argument (param (ref eq))))
-   (import "fail" "caml_failwith" (func $caml_failwith (param (ref eq))))
-   (import "jslib" "wrap" (func $wrap (param anyref) (result (ref eq))))
-   (import "jslib" "unwrap" (func $unwrap (param (ref eq)) (result anyref)))
-   (import "int32" "caml_copy_int32"
-      (func $caml_copy_int32 (param i32) (result (ref eq))))
-   (import "int32" "Int32_val"
-      (func $Int32_val (param (ref eq)) (result i32)))
-   (import "int32" "caml_copy_nativeint"
-      (func $caml_copy_nativeint (param i32) (result (ref eq))))
-   (import "int64" "caml_copy_int64"
-      (func $caml_copy_int64 (param i64) (result (ref eq))))
-   (import "int64" "Int64_val"
-      (func $Int64_val (param (ref eq)) (result i64)))
-   (import "obj" "double_array_tag" (global $double_array_tag i32))
-   (import "compare" "unordered" (global $unordered i32))
-   (import "hash" "caml_hash_mix_int"
-      (func $caml_hash_mix_int (param i32) (param i32) (result i32)))
-   (import "hash" "caml_hash_mix_int64"
-      (func $caml_hash_mix_int64 (param i32) (param i64) (result i32)))
-   (import "hash" "caml_hash_mix_double"
-      (func $caml_hash_mix_double (param i32) (param f64) (result i32)))
-   (import "hash" "caml_hash_mix_float"
-      (func $caml_hash_mix_float (param i32) (param f32) (result i32)))
-   (import "hash" "caml_hash_mix_float16"
-      (func $caml_hash_mix_float16 (param i32) (param i32) (result i32)))
-   (import "marshal" "caml_serialize_int_1"
-      (func $caml_serialize_int_1 (param (ref eq)) (param i32)))
-   (import "marshal" "caml_serialize_int_2"
-      (func $caml_serialize_int_2 (param (ref eq)) (param i32)))
-   (import "marshal" "caml_serialize_int_4"
-      (func $caml_serialize_int_4 (param (ref eq)) (param i32)))
-   (import "marshal" "caml_serialize_int_8"
-      (func $caml_serialize_int_8 (param (ref eq)) (param i64)))
-   (import "marshal" "caml_deserialize_uint_1"
-      (func $caml_deserialize_uint_1 (param (ref eq)) (result i32)))
-   (import "marshal" "caml_deserialize_sint_1"
-      (func $caml_deserialize_sint_1 (param (ref eq)) (result i32)))
-   (import "marshal" "caml_deserialize_uint_2"
-      (func $caml_deserialize_uint_2 (param (ref eq)) (result i32)))
-   (import "marshal" "caml_deserialize_sint_2"
-      (func $caml_deserialize_sint_2 (param (ref eq)) (result i32)))
-   (import "marshal" "caml_deserialize_int_4"
-      (func $caml_deserialize_int_4 (param (ref eq)) (result i32)))
-   (import "marshal" "caml_deserialize_int_8"
-      (func $caml_deserialize_int_8 (param (ref eq)) (result i64)))
 
    (type $block (array (mut (ref eq))))
    (type $bytes (array (mut i8)))

runtime/wasm/effect.wat

@@ -25,6 +25,9 @@
      (func $caml_fresh_oo_id (param (ref eq)) (result (ref eq))))
    (import "obj" "cont_tag" (global $cont_tag i32))
    (import "obj" "object_tag" (global $object_tag i32))
+   (import "obj" "caml_callback_1"
+      (func $caml_callback_1
+         (param (ref eq)) (param (ref eq)) (result (ref eq))))
    (import "stdlib" "caml_named_value"
       (func $caml_named_value (param (ref eq)) (result (ref null eq))))
    (import "fail" "ocaml_exception" (tag $ocaml_exception (param (ref eq))))
@@ -38,9 +41,6 @@
          (param $f funcref) (param $env eqref) (result anyref)))
    (import "bindings" "resume_fiber"
       (func $resume_fiber (param externref) (param (ref eq))))
-   (import "obj" "caml_callback_1"
-      (func $caml_callback_1
-         (param (ref eq)) (param (ref eq)) (result (ref eq))))
 
    (type $block (array (mut (ref eq))))
    (type $bytes (array (mut i8)))

runtime/wasm/fs.wat

@@ -40,14 +40,14 @@
       (func $caml_jsstring_of_string (param (ref eq)) (result (ref eq))))
    (import "jslib" "caml_js_to_string_array"
       (func $caml_js_to_string_array (param $a (ref extern)) (result (ref eq))))
-   (import "fail" "caml_raise_sys_error"
-      (func $caml_raise_sys_error (param (ref eq))))
    (import "fail" "javascript_exception"
       (tag $javascript_exception (param externref)))
    (import "sys" "caml_handle_sys_error"
       (func $caml_handle_sys_error (param externref)))
    (import "string" "caml_string_concat"
       (func $caml_string_concat (param (ref eq) (ref eq)) (result (ref eq))))
+   (import "fail" "caml_raise_sys_error"
+      (func $caml_raise_sys_error (param (ref eq))))
 
    (type $bytes (array (mut i8)))
 

runtime/wasm/io.wat

@@ -72,6 +72,10 @@
       (func $dv_get_ui8 (param externref i32) (result i32)))
    (import "bindings" "dv_set_i8"
       (func $dv_set_i8 (param externref i32 i32)))
+   (import "fail" "javascript_exception"
+      (tag $javascript_exception (param externref)))
+   (import "sys" "caml_handle_sys_error"
+      (func $caml_handle_sys_error (param externref)))
    (import "custom" "custom_compare_id"
       (func $custom_compare_id
         (param (ref eq)) (param (ref eq)) (param i32) (result i32)))
@@ -82,10 +86,6 @@
       (func $caml_copy_int64 (param i64) (result (ref eq))))
    (import "int64" "Int64_val"
       (func $Int64_val (param (ref eq)) (result i64)))
-   (import "fail" "javascript_exception"
-      (tag $javascript_exception (param externref)))
-   (import "sys" "caml_handle_sys_error"
-      (func $caml_handle_sys_error (param externref)))
    (import "bigarray" "caml_ba_get_data"
       (func $caml_ba_get_data (param (ref eq)) (result (ref extern))))
 
@@ -99,6 +99,25 @@
    (import "bindings" "map_delete"
       (func $map_delete (param (ref extern)) (param i32)))
 
+   (func $ta_blit_from_buffer
+      (param $buf (ref extern)) (param $i i32)
+      (param $ta (ref extern)) (param $j i32)
+      (param $len i32)
+      (call $ta_set
+         (local.get $ta)
+         (call $ta_subarray (local.get $buf) (local.get $i)
+            (i32.add (local.get $i) (local.get $len)))
+         (local.get $j)))
+
+   (func $ta_blit_to_buffer
+      (param $ta (ref extern)) (param $i i32)
+      (param $buf (ref extern)) (param $j i32)
+      (param $len i32)
+      (call $ta_set (local.get $buf)
+         (call $ta_subarray (local.get $ta) (local.get $i)
+            (i32.add (local.get $i) (local.get $len)))
+         (local.get $j)))
+
    (type $block (array (mut (ref eq))))
    (type $bytes (array (mut i8)))
    (type $offset_array (array (mut i64)))
@@ -462,12 +481,12 @@
          (then
             (if (i32.gt_u (local.get $len) (local.get $avail))
                (then (local.set $len (local.get $avail))))
-            (call $ta_set (local.get $d)
-               (call $ta_subarray (struct.get $channel $buffer (local.get $ch))
-                  (struct.get $channel $curr (local.get $ch))
-                  (i32.add (struct.get $channel $curr (local.get $ch))
-                     (local.get $len)))
-               (local.get $pos))
+            (call $ta_blit_from_buffer
+               (struct.get $channel $buffer (local.get $ch))
+               (struct.get $channel $curr (local.get $ch))
+               (local.get $d)
+               (local.get $pos)
+               (local.get $len))
             (struct.set $channel $curr (local.get $ch)
                (i32.add (struct.get $channel $curr (local.get $ch))
                   (local.get $len)))
@@ -478,10 +497,12 @@
       (struct.set $channel $max (local.get $ch) (local.get $nread))
       (if (i32.gt_u (local.get $len) (local.get $nread))
          (then (local.set $len (local.get $nread))))
-      (call $ta_set (local.get $d)
-         (call $ta_subarray (struct.get $channel $buffer (local.get $ch))
-            (i32.const 0) (local.get $len))
-         (local.get $pos))
+      (call $ta_blit_from_buffer
+         (struct.get $channel $buffer (local.get $ch))
+         (i32.const 0)
+         (local.get $d)
+         (local.get $pos)
+         (local.get $len))
       (struct.set $channel $curr (local.get $ch) (local.get $len))
       (local.get $len))
 
@@ -576,10 +597,7 @@
       (local.set $ch (ref.cast (ref $channel) (local.get $vch)))
       (ref.i31
          (i32.sub
-            (i32.wrap_i64
-               (struct.get $fd_offset $offset
-                  (call $get_fd_offset
-                     (struct.get $channel $fd (local.get $ch)))))
+            (i32.wrap_i64 (call $caml_ml_get_channel_offset (local.get $ch)))
             (i32.sub
               (struct.get $channel $max (local.get $ch))
               (struct.get $channel $curr (local.get $ch))))))
@@ -589,10 +607,7 @@
       (local $ch (ref $channel))
       (local.set $ch (ref.cast (ref $channel) (local.get $vch)))
       (call $caml_copy_int64
-         (i64.sub
-            (struct.get $fd_offset $offset
-               (call $get_fd_offset
-                  (struct.get $channel $fd (local.get $ch))))
+         (i64.sub (call $caml_ml_get_channel_offset (local.get $ch))
             (i64.extend_i32_s
                (i32.sub
                   (struct.get $channel $max (local.get $ch))
@@ -604,21 +619,15 @@
       (local.set $ch (ref.cast (ref $channel) (local.get $vch)))
       (ref.i31
          (i32.add
-            (i32.wrap_i64
-               (struct.get $fd_offset $offset
-                  (call $get_fd_offset
-                     (struct.get $channel $fd (local.get $ch)))))
+            (i32.wrap_i64 (call $caml_ml_get_channel_offset (local.get $ch)))
             (struct.get $channel $curr (local.get $ch)))))
 
    (func (export "caml_ml_pos_out_64")
       (param $vch (ref eq)) (result (ref eq))
       (local $ch (ref $channel))
       (local.set $ch (ref.cast (ref $channel) (local.get $vch)))
       (call $caml_copy_int64
-         (i64.add
-            (struct.get $fd_offset $offset
-               (call $get_fd_offset
-                  (struct.get $channel $fd (local.get $ch))))
+         (i64.add (call $caml_ml_get_channel_offset (local.get $ch))
             (i64.extend_i32_s (struct.get $channel $curr (local.get $ch))))))
 
    (func $caml_seek_in
@@ -850,10 +859,10 @@
       (if (i32.ge_u (local.get $len) (local.get $free))
          (then (local.set $len (local.get $free))))
       (local.set $buf (struct.get $channel $buffer (local.get $ch)))
-      (call $ta_set (local.get $buf)
-         (call $ta_subarray (local.get $d)
-            (local.get $pos) (i32.add (local.get $pos) (local.get $len)))
-         (local.get $curr))
+      (call $ta_blit_to_buffer
+         (local.get $d) (local.get $pos)
+         (local.get $buf) (local.get $curr)
+         (local.get $len))
       (struct.set $channel $curr (local.get $ch)
          (i32.add (local.get $curr) (local.get $len)))
       (if (i32.ge_u (local.get $len) (local.get $free))
@@ -980,7 +989,8 @@
       (struct.set $channel $fd
          (ref.cast (ref $channel) (local.get 0)) (local.get 1)))
 
-   (func (export "caml_ml_get_channel_offset") (param $ch (ref eq)) (result i64)
+   (func $caml_ml_get_channel_offset (export "caml_ml_get_channel_offset")
+      (param $ch (ref eq)) (result i64)
       (struct.get $fd_offset $offset
          (call $get_fd_offset
             (struct.get $channel $fd

runtime/wasm/marshal.wat

@@ -30,11 +30,6 @@
       (func $caml_is_closure (param (ref eq)) (result i32)))
    (import "effect" "caml_is_continuation"
       (func $caml_is_continuation (param (ref eq)) (result i32)))
-   (import "bindings" "map_new" (func $map_new (result (ref any))))
-   (import "bindings" "map_get"
-      (func $map_get (param (ref any)) (param (ref eq)) (result i31ref)))
-   (import "bindings" "map_set"
-      (func $map_set (param (ref any)) (param (ref eq)) (param (ref i31))))
    (import "io" "caml_really_putblock"
       (func $caml_really_putblock
          (param (ref eq)) (param (ref $bytes)) (param i32) (param i32)))
@@ -49,6 +44,11 @@
    (import "custom" "caml_find_custom_operations"
       (func $caml_find_custom_operations
          (param (ref $bytes)) (result (ref null $custom_operations))))
+   (import "bindings" "map_new" (func $map_new (result (ref any))))
+   (import "bindings" "map_get"
+      (func $map_get (param (ref any)) (param (ref eq)) (result i31ref)))
+   (import "bindings" "map_set"
+      (func $map_set (param (ref any)) (param (ref eq)) (param (ref i31))))
 
    (@string $input_val_from_string "input_value_from_string")
 

runtime/wasm/stdlib.wat

@@ -31,7 +31,6 @@
    (import "obj" "caml_callback_2"
       (func $caml_callback_2
          (param (ref eq)) (param (ref eq)) (param (ref eq)) (result (ref eq))))
-   (import "bindings" "write" (func $write (param i32) (param anyref)))
    (import "string" "caml_string_concat"
       (func $caml_string_concat
          (param (ref eq)) (param (ref eq)) (result (ref eq))))
@@ -41,6 +40,7 @@
    (import "fail" "ocaml_exception" (tag $ocaml_exception (param (ref eq))))
    (import "fail" "javascript_exception"
       (tag $javascript_exception (param externref)))
+   (import "bindings" "write" (func $write (param i32) (param anyref)))
    (import "bindings" "exit" (func $exit (param i32)))
 
    (type $block (array (mut (ref eq))))
@@ -197,6 +197,7 @@
 
    (func $caml_main (export "caml_main") (param $start (ref func))
       (local $exn (ref eq))
+      (local $msg (ref eq))
       (try
          (do
             (drop (call_ref $func (ref.cast (ref $func) (local.get $start)))))
@@ -223,13 +224,14 @@
                         (br_on_null $null
                            (call $caml_named_value (global.get $do_at_exit)))
                         (ref.i31 (i32.const 0)))))
+               (local.set $msg
+                  (call $caml_string_concat
+                     (global.get $fatal_error)
+                     (call $caml_string_concat
+                        (call $caml_format_exception (local.get $exn))
+                        (@string "\n"))))
                (call $write (i32.const 2)
                   (call $unwrap
-                     (call $caml_jsstring_of_string
-                        (call $caml_string_concat
-                           (global.get $fatal_error)
-                           (call $caml_string_concat
-                              (call $caml_format_exception (local.get $exn))
-                              (@string "\n")))))))
+                     (call $caml_jsstring_of_string (local.get $msg)))))
             (call $exit (i32.const 2)))))
 )