Wasm runtime: rename some functions

Author: vouillon

runtime/wasm/bigarray.wat

@@ -69,12 +69,12 @@
    (import "bindings" "ta_subarray"
       (func $ta_subarray
          (param (ref extern)) (param i32) (param i32) (result (ref extern))))
-   (import "bindings" "ta_blit_from_string"
-      (func $ta_blit_from_string
+   (import "bindings" "ta_blit_from_bytes"
+      (func $ta_blit_from_bytes
          (param (ref $bytes)) (param i32) (param (ref extern)) (param i32)
          (param i32)))
-   (import "bindings" "ta_blit_to_string"
-      (func $ta_blit_to_string
+   (import "bindings" "ta_blit_to_bytes"
+      (func $ta_blit_to_bytes
          (param (ref extern)) (param i32) (param (ref $bytes)) (param i32)
          (param i32)))
    (import "fail" "caml_bound_error" (func $caml_bound_error))
@@ -2030,15 +2030,15 @@
          (ref.as_non_null (extern.convert_any (call $unwrap (local.get 0)))))
       (local.set $len (call $ta_length (local.get $a)))
       (local.set $s (array.new $bytes (i32.const 0) (local.get $len)))
-      (call $ta_blit_to_string
+      (call $ta_blit_to_bytes
          (local.get $a) (i32.const 0) (local.get $s) (i32.const 0)
          (local.get $len))
       (local.get $s))
 
    (export "caml_uint8_array_of_bytes" (func $caml_uint8_array_of_string))
    (func $caml_uint8_array_of_string (export "caml_uint8_array_of_string")
       (param (ref eq)) (result (ref eq))
-      ;; Convert a string to a typed array
+      ;; Convert bytes to a typed array
       (local $ta (ref extern)) (local $len i32)
       (local $s (ref $bytes))
       (local.set $s (ref.cast (ref $bytes) (local.get 0)))
@@ -2047,7 +2047,7 @@
          (call $ta_create
             (i32.const 3) ;; Uint8Array
             (local.get $len)))
-      (call $ta_blit_from_string
+      (call $ta_blit_from_bytes
          (local.get $s) (i32.const 0) (local.get $ta) (i32.const 0)
          (local.get $len))
       (call $wrap (any.convert_extern (local.get $ta))))

runtime/wasm/bigstring.wat

@@ -48,12 +48,12 @@
       (func $ta_length (param (ref extern)) (result i32)))
    (import "bindings" "ta_bytes"
       (func $ta_bytes (param anyref) (result anyref)))
-   (import "bindings" "ta_blit_from_string"
-      (func $ta_blit_from_string
+   (import "bindings" "ta_blit_from_bytes"
+      (func $ta_blit_from_bytes
          (param (ref $bytes)) (param i32) (param (ref extern)) (param i32)
          (param i32)))
-   (import "bindings" "ta_blit_to_string"
-      (func $ta_blit_to_string
+   (import "bindings" "ta_blit_to_bytes"
+      (func $ta_blit_to_bytes
          (param (ref extern)) (param i32) (param (ref $bytes)) (param i32)
          (param i32)))
    (import "hash" "caml_hash_mix_int"
@@ -240,7 +240,7 @@
       (local.set $d2 (call $caml_ba_get_data (local.get $ba2)))
       (local.set $pos2 (i31.get_s (ref.cast (ref i31) (local.get $vpos2))))
       (local.set $len (i31.get_s (ref.cast (ref i31) (local.get $vlen))))
-      (call $ta_blit_from_string
+      (call $ta_blit_from_bytes
          (local.get $s1) (local.get $pos1)
          (local.get $d2) (local.get $pos2)
          (local.get $len))
@@ -258,7 +258,7 @@
       (local.set $s2 (ref.cast (ref $bytes) (local.get $str2)))
       (local.set $pos2 (i31.get_s (ref.cast (ref i31) (local.get $vpos2))))
       (local.set $len (i31.get_s (ref.cast (ref i31) (local.get $vlen))))
-      (call $ta_blit_to_string
+      (call $ta_blit_to_bytes
          (local.get $d1) (local.get $pos1)
          (local.get $s2) (local.get $pos2)
          (local.get $len))

runtime/wasm/custom.wat

@@ -22,8 +22,8 @@
    (import "int64" "int64_ops" (global $int64_ops (ref $custom_operations)))
    (import "bigarray" "bigarray_ops"
       (global $bigarray_ops (ref $custom_operations)))
-   (import "string" "caml_string_equal"
-      (func $caml_string_equal
+   (import "string" "caml_bytes_equal"
+      (func $caml_bytes_equal
          (param (ref eq)) (param (ref eq)) (result (ref eq))))
 
    (type $bytes (array (mut i8)))
@@ -116,7 +116,7 @@
          (loop $loop
             (if (i31.get_u
                    (ref.cast (ref i31)
-                       (call $caml_string_equal (local.get $id)
+                       (call $caml_bytes_equal (local.get $id)
                          (struct.get $custom_operations $id
                             (struct.get $custom_operations_list $ops
                                (local.get $l))))))

runtime/wasm/float.wat

@@ -27,10 +27,10 @@
       (func $caml_invalid_argument (param (ref eq))))
    (import "ints" "lowercase_hex_table"
       (global $lowercase_hex_table (ref $chars)))
-   (import "jsstring" "jsstring_of_string"
-      (func $jsstring_of_string (param (ref $bytes)) (result anyref)))
-   (import "jsstring" "string_of_jsstring"
-      (func $string_of_jsstring (param anyref) (result (ref $bytes))))
+   (import "jsstring" "jsstring_of_bytes"
+      (func $jsstring_of_bytes (param (ref $bytes)) (result anyref)))
+   (import "jsstring" "bytes_of_jsstring"
+      (func $bytes_of_jsstring (param anyref) (result (ref $bytes))))
 
    (type $float (struct (field f64)))
    (type $bytes (array (mut i8)))
@@ -308,7 +308,7 @@
                   (local.get $precision) (local.get $conversion)
                   (local.get $i)
                   (f64.abs (local.get $f))))
-            (local.set $s (call $string_of_jsstring (local.get $num)))
+            (local.set $s (call $bytes_of_jsstring (local.get $num)))
             (br $sign (local.get $s))))
       (if (local.get $negative)
          (then
@@ -660,7 +660,7 @@
                                                 (local.get $negative))))
                                        ))))))))))))))))))
          (local.set $f
-            (call $parse_float (call $jsstring_of_string (local.get $s))))
+            (call $parse_float (call $jsstring_of_bytes (local.get $s))))
          (br_if $error (f64.ne (local.get $f) (local.get $f)))
          (return (struct.new $float (local.get $f))))
       (call $caml_failwith

runtime/wasm/io.wat

@@ -55,12 +55,12 @@
       (func $ta_set_ui8 (param (ref extern)) (param i32) (param i32))) ;; ZZZ ??
    (import "bindings" "ta_get_ui8"
       (func $ta_get_ui8 (param (ref extern)) (param i32) (result i32)))
-   (import "bindings" "ta_blit_from_string"
-      (func $ta_blit_from_string
+   (import "bindings" "ta_blit_from_bytes"
+      (func $ta_blit_from_bytes
          (param (ref $bytes)) (param i32) (param (ref extern)) (param i32)
          (param i32)))
-   (import "bindings" "ta_blit_to_string"
-      (func $ta_blit_to_string
+   (import "bindings" "ta_blit_to_bytes"
+      (func $ta_blit_to_bytes
          (param (ref extern)) (param i32) (param (ref $bytes)) (param i32)
          (param i32)))
    (import "custom" "custom_compare_id"
@@ -367,7 +367,7 @@
          (then
             (if (i32.gt_u (local.get $len) (local.get $avail))
                (then (local.set $len (local.get $avail))))
-            (call $ta_blit_to_string
+            (call $ta_blit_to_bytes
                (struct.get $channel $buffer (local.get $ch))
                (struct.get $channel $curr (local.get $ch))
                (local.get $s) (local.get $pos)
@@ -382,7 +382,7 @@
       (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_blit_to_string
+      (call $ta_blit_to_bytes
          (struct.get $channel $buffer (local.get $ch))
          (i32.const 0)
          (local.get $s) (local.get $pos)
@@ -438,7 +438,7 @@
                   (local.set $curr (i32.const 0))
                   (if (i32.gt_u (local.get $len) (local.get $nread))
                      (then (local.set $len (local.get $nread))))))))
-      (call $ta_blit_to_string
+      (call $ta_blit_to_bytes
          (local.get $buf) (local.get $curr)
          (local.get $s) (local.get $pos) (local.get $len))
       (struct.set $channel $curr (local.get $ch)
@@ -731,7 +731,7 @@
       (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_blit_from_string
+      (call $ta_blit_from_bytes
          (local.get $s) (local.get $pos)
          (local.get $buf) (local.get $curr) (local.get $len))
       (struct.set $channel $curr (local.get $ch)

runtime/wasm/jslib.wat

@@ -84,13 +84,12 @@
       (func $caml_is_closure (param (ref eq)) (result i32)))
    (import "obj" "caml_is_last_arg"
       (func $caml_is_last_arg (param (ref eq)) (result i32)))
-   (import "jsstring" "jsstring_of_string"
-      (func $jsstring_of_string (param (ref $bytes)) (result anyref)))
-   (import "jsstring" "string_of_jsstring"
-      (func $string_of_jsstring (param anyref) (result (ref $bytes))))
-   (import "jsstring" "jsstring_of_substring"
-      (func $jsstring_of_substring
-         (param (ref $bytes) i32 i32) (result anyref)))
+   (import "jsstring" "jsstring_of_bytes"
+      (func $jsstring_of_bytes (param (ref $bytes)) (result anyref)))
+   (import "jsstring" "bytes_of_jsstring"
+      (func $bytes_of_jsstring (param anyref) (result (ref $bytes))))
+   (import "jsstring" "jsstring_of_subbytes"
+      (func $jsstring_of_subbytes (param (ref $bytes) i32 i32) (result anyref)))
    (import "int32" "caml_copy_int32"
       (func $caml_copy_int32 (param i32) (result (ref eq))))
    (import "int32" "Int32_val"
@@ -188,7 +187,7 @@
       (result (ref eq))
       (if (ref.test (ref $bytes) (local.get $f))
          (then
-            (local.set $f (call $caml_jsbytes_of_string (local.get $f)))))
+            (local.set $f (call $caml_jsbytes_of_bytes (local.get $f)))))
       (return_call $wrap
          (call $meth_call (call $unwrap (local.get $o))
             (call $unwrap (local.get $f))
@@ -198,7 +197,7 @@
       (param (ref eq)) (param (ref eq)) (result (ref eq))
       (if (ref.test (ref $bytes) (local.get 1))
          (then
-            (local.set 1 (call $caml_jsbytes_of_string (local.get 1)))))
+            (local.set 1 (call $caml_jsbytes_of_bytes (local.get 1)))))
       (return_call $wrap
          (call $get
             (ref.as_non_null (extern.convert_any (call $unwrap (local.get 0))))
@@ -208,7 +207,7 @@
       (param (ref eq)) (param (ref eq)) (param (ref eq)) (result (ref eq))
       (if (ref.test (ref $bytes) (local.get 1))
          (then
-            (local.set 1 (call $caml_jsbytes_of_string (local.get 1)))))
+            (local.set 1 (call $caml_jsbytes_of_bytes (local.get 1)))))
       (call $set (call $unwrap (local.get 0)) (call $unwrap (local.get 1))
          (call $unwrap (local.get 2)))
       (ref.i31 (i32.const 0)))
@@ -217,7 +216,7 @@
       (param (ref eq)) (param (ref eq)) (result (ref eq))
       (if (ref.test (ref $bytes) (local.get 1))
          (then
-            (local.set 1 (call $caml_jsbytes_of_string (local.get 1)))))
+            (local.set 1 (call $caml_jsbytes_of_bytes (local.get 1)))))
       (call $delete (call $unwrap (local.get 0)) (call $unwrap (local.get 1)))
       (ref.i31 (i32.const 0)))
 
@@ -265,7 +264,7 @@
                      (array.get $block (local.get $a) (local.get $i))))
                (call $set (local.get $o)
                   (call $unwrap
-                     (call $caml_jsstring_of_string
+                     (call $caml_jsstring_of_bytes
                         (array.get $block (local.get $p) (i32.const 1))))
                   (call $unwrap
                         (array.get $block (local.get $p) (i32.const 2))))
@@ -454,24 +453,24 @@
                                  (local.get $acc)))))))))
       (return_call $unwrap (local.get $acc)))
 
-   (export "caml_js_from_string" (func $caml_jsstring_of_string))
-   (func $caml_jsstring_of_string (export "caml_jsstring_of_string")
+   (export "caml_js_from_string" (func $caml_jsstring_of_bytes))
+   (func $caml_jsstring_of_bytes (export "caml_jsstring_of_string")
       (param (ref eq)) (result (ref eq))
       (local $s (ref $bytes))
       (local.set $s (ref.cast (ref $bytes) (local.get 0)))
-      (return (struct.new $js (call $jsstring_of_string (local.get $s)))))
+      (return (struct.new $js (call $jsstring_of_bytes (local.get $s)))))
 
    (func (export "caml_jsstring_of_substring")
       (param $s (ref eq)) (param $i (ref eq)) (param $l (ref eq))
       (result (ref eq))
       (return
          (struct.new $js
-            (call $jsstring_of_substring
+            (call $jsstring_of_subbytes
                (ref.cast (ref $bytes) (local.get $s))
                (i31.get_u (ref.cast (ref i31) (local.get $i)))
                (i31.get_u (ref.cast (ref i31) (local.get $l)))))))
 
-   (func $caml_jsbytes_of_string (export "caml_jsbytes_of_string")
+   (func $caml_jsbytes_of_bytes (export "caml_jsbytes_of_string")
       (param (ref eq)) (result (ref eq))
       (local $s (ref $bytes))
       (local $s' (ref $bytes))
@@ -492,7 +491,7 @@
          (then
             (return
                (struct.new $js
-                  (call $jsstring_of_string (local.get $s))))))
+                  (call $jsstring_of_bytes (local.get $s))))))
       (local.set $s'
          (array.new $bytes (i32.const 0)
             (i32.add (local.get $i) (local.get $n))))
@@ -519,20 +518,20 @@
                      (local.set $n (i32.add (local.get $n) (i32.const 2)))))
                (local.set $i (i32.add (local.get $i) (i32.const 1)))
                (br $fill))))
-      (return (struct.new $js (call $jsstring_of_string (local.get $s')))))
+      (return (struct.new $js (call $jsstring_of_bytes (local.get $s')))))
 
    (export "caml_js_to_string" (func $caml_string_of_jsstring))
    (func $caml_string_of_jsstring (export "caml_string_of_jsstring")
       (param $s (ref eq)) (result (ref eq))
-      (return_call $string_of_jsstring
+      (return_call $bytes_of_jsstring
          (struct.get $js 0 (ref.cast (ref $js) (local.get $s)))))
 
    (func (export "caml_string_of_jsbytes")
       (param $s (ref eq)) (result (ref eq))
       (local $l i32) (local $i i32) (local $n i32) (local $c i32)
       (local $s' (ref $bytes)) (local $s'' (ref $bytes))
       (local.set $s'
-         (call $string_of_jsstring
+         (call $bytes_of_jsstring
             (struct.get $js 0 (ref.cast (ref $js) (local.get $s)))))
       (local.set $l (array.len (local.get $s')))
       (local.set $i (i32.const 0))
@@ -652,7 +651,7 @@
                (call $meth_call
                   (local.get $exn)
                   (call $unwrap
-                     (call $caml_jsstring_of_string
+                     (call $caml_jsstring_of_bytes
                         (array.new_data $bytes $toString
                            (i32.const 0) (i32.const 8))))
                   (any.convert_extern (call $new_array (i32.const 0))))))))

runtime/wasm/jsstring.wat

@@ -98,8 +98,7 @@
 
    (export "jsstring_hash" (func $hash_string))
 
-   ;; Used by package zarith_stubs_js
-   (func $jsstring_of_substring (export "jsstring_of_substring")
+   (func $jsstring_of_subbytes (export "jsstring_of_subbytes")
       (param $s (ref $bytes)) (param $pos i32) (param $len i32)
       (result anyref)
       (local $i i32) (local $c i32)
@@ -130,14 +129,14 @@
                (any.convert_extern
                   (call $fromCharCodeArray (global.get $buffer)
                      (i32.const 0) (local.get $len))))))
-      (return_call $jsstring_of_substring_fallback
+      (return_call $jsstring_of_subbytes_fallback
          (local.get $s) (local.get $pos) (local.get $len)))
 
-   (func (export "jsstring_of_string") (param $s (ref $bytes)) (result anyref)
-      (return_call $jsstring_of_substring
+   (func (export "jsstring_of_bytes") (param $s (ref $bytes)) (result anyref)
+      (return_call $jsstring_of_subbytes
          (local.get $s) (i32.const 0) (array.len (local.get $s))))
 
-   (func (export "string_of_jsstring") (param $s anyref) (result (ref $bytes))
+   (func (export "bytes_of_jsstring") (param $s anyref) (result (ref $bytes))
       (if (global.get $text_converters_available)
          (then
             (return_call $encodeStringToUTF8Array
@@ -162,7 +161,7 @@
                (local.set $i (i32.add (local.get $i) (i32.const 1)))
                (br $loop)))))
 
-   (func $jsstring_of_substring_fallback
+   (func $jsstring_of_subbytes_fallback
       (param $s (ref $bytes)) (param $pos i32) (param $len i32)
       (result anyref)
       (local $s' anyref)

runtime/wasm/runtime.js

@@ -221,10 +221,10 @@
     ta_copy: (ta, t, s, n) => ta.copyWithin(t, s, n),
     ta_bytes: (a) =>
       new Uint8Array(a.buffer, a.byteOffset, a.length * a.BYTES_PER_ELEMENT),
-    ta_blit_from_string: (s, p1, a, p2, l) => {
+    ta_blit_from_bytes: (s, p1, a, p2, l) => {
       for (let i = 0; i < l; i++) a[p2 + i] = string_get(s, p1 + i);
     },
-    ta_blit_to_string: (a, p1, s, p2, l) => {
+    ta_blit_to_bytes: (a, p1, s, p2, l) => {
       for (let i = 0; i < l; i++) string_set(s, p2 + i, a[p1 + i]);
     },
     wrap_callback: (f) =>