Compiler: move some aliases to the runtime

Author: hhugo

compiler/lib/generate.ml

@@ -2217,15 +2217,9 @@ let f
 let init () =
   List.iter
     ~f:(fun (nm, nm') -> Primitive.alias nm nm')
-    [ "%int_mul", "caml_mul"
-    ; "%int_div", "caml_div"
-    ; "%int_mod", "caml_mod"
-    ; "caml_int32_neg", "%int_neg"
+    [ "caml_int32_neg", "%int_neg"
     ; "caml_int32_add", "%int_add"
     ; "caml_int32_sub", "%int_sub"
-    ; "caml_int32_mul", "%int_mul"
-    ; "caml_int32_div", "%int_div"
-    ; "caml_int32_mod", "%int_mod"
     ; "caml_int32_and", "%int_and"
     ; "caml_int32_or", "%int_or"
     ; "caml_int32_xor", "%int_xor"
@@ -2236,15 +2230,9 @@ let init () =
     ; "caml_int32_to_int", "%identity"
     ; "caml_int32_of_float", "caml_int_of_float"
     ; "caml_int32_to_float", "%identity"
-    ; "caml_int32_format", "caml_format_int"
-    ; "caml_int32_of_string", "caml_int_of_string"
-    ; "caml_int32_compare", "caml_int_compare"
     ; "caml_nativeint_neg", "%int_neg"
     ; "caml_nativeint_add", "%int_add"
     ; "caml_nativeint_sub", "%int_sub"
-    ; "caml_nativeint_mul", "%int_mul"
-    ; "caml_nativeint_div", "%int_div"
-    ; "caml_nativeint_mod", "%int_mod"
     ; "caml_nativeint_and", "%int_and"
     ; "caml_nativeint_or", "%int_or"
     ; "caml_nativeint_xor", "%int_xor"
@@ -2257,28 +2245,12 @@ let init () =
     ; "caml_nativeint_to_float", "%identity"
     ; "caml_nativeint_of_int32", "%identity"
     ; "caml_nativeint_to_int32", "%identity"
-    ; "caml_nativeint_format", "caml_format_int"
-    ; "caml_nativeint_of_string", "caml_int_of_string"
-    ; "caml_nativeint_compare", "caml_int_compare"
-    ; "caml_nativeint_bswap", "caml_int32_bswap"
-    ; "caml_int64_of_int", "caml_int64_of_int32"
-    ; "caml_int64_to_int", "caml_int64_to_int32"
-    ; "caml_int64_of_nativeint", "caml_int64_of_int32"
-    ; "caml_int64_to_nativeint", "caml_int64_to_int32"
     ; "caml_float_of_int", "%identity"
-    ; "caml_array_get_float", "caml_array_get"
-    ; "caml_floatarray_get", "caml_array_get"
-    ; "caml_array_get_addr", "caml_array_get"
-    ; "caml_array_set_float", "caml_array_set"
-    ; "caml_floatarray_set", "caml_array_set"
-    ; "caml_array_set_addr", "caml_array_set"
     ; "caml_array_unsafe_get_float", "caml_array_unsafe_get"
     ; "caml_floatarray_unsafe_get", "caml_array_unsafe_get"
     ; "caml_array_unsafe_set_float", "caml_array_unsafe_set"
     ; "caml_array_unsafe_set_addr", "caml_array_unsafe_set"
     ; "caml_floatarray_unsafe_set", "caml_array_unsafe_set"
-    ; "caml_check_bound_gen", "caml_check_bound"
-    ; "caml_check_bound_float", "caml_check_bound"
     ; "caml_alloc_dummy_float", "caml_alloc_dummy"
     ; "caml_js_from_float", "%identity"
     ; "caml_js_to_float", "%identity"

runtime/js/array.js

@@ -106,6 +106,9 @@ function caml_uniform_array_blit(a1, i1, a2, i2, len) {
 ///////////// Pervasive
 //Provides: caml_array_set (mutable, const, mutable)
 //Requires: caml_array_bound_error
+//Alias: caml_array_set_float
+//Alias: caml_floatarray_set
+//Alias: caml_array_set_addr
 function caml_array_set(array, index, newval) {
   if (index < 0 || index >= array.length - 1) caml_array_bound_error();
   array[index + 1] = newval;
@@ -114,6 +117,9 @@ function caml_array_set(array, index, newval) {
 
 //Provides: caml_array_get mutable (mutable, const)
 //Requires: caml_array_bound_error
+//Alias: caml_array_get_float
+//Alias: caml_floatarray_get
+//Alias: caml_array_get_addr
 function caml_array_get(array, index) {
   if (index < 0 || index >= array.length - 1) caml_array_bound_error();
   return array[index + 1];
@@ -150,6 +156,8 @@ function caml_uniform_array_fill(array, ofs, len, v) {
 
 //Provides: caml_check_bound (mutable, const)
 //Requires: caml_array_bound_error
+//Alias: caml_check_bound_gen
+//Alias: caml_check_bound_float
 function caml_check_bound(array, index) {
   if (index >>> 0 >= array.length - 1) caml_array_bound_error();
   return array;

runtime/js/compare.js

@@ -257,6 +257,8 @@ function caml_compare(a, b) {
   return caml_compare_val(a, b, true);
 }
 //Provides: caml_int_compare mutable (const, const)
+//Alias: caml_int32_compare
+//Alias: caml_nativeint_compare
 function caml_int_compare(a, b) {
   if (a < b) return -1;
   if (a === b) return 0;

runtime/js/int64.js

@@ -339,11 +339,15 @@ function caml_int64_mod(x, y) {
 
 //Provides: caml_int64_of_int32 const
 //Requires: MlInt64
+//Alias: caml_int64_of_int
+//Alias: caml_int64_of_nativeint
 function caml_int64_of_int32(x) {
   return new MlInt64(x & 0xffffff, (x >> 24) & 0xffffff, (x >> 31) & 0xffff);
 }
 
 //Provides: caml_int64_to_int32 const
+//Alias: caml_int64_to_int
+//Alias: caml_int64_to_nativeint
 function caml_int64_to_int32(x) {
   return x.toInt();
 }

runtime/js/ints.js

@@ -18,6 +18,8 @@
 //Provides: caml_format_int const (const, const)
 //Requires: caml_parse_format, caml_finish_formatting, caml_str_repeat
 //Requires: caml_string_of_jsbytes, caml_jsbytes_of_string
+//Alias: caml_int32_format
+//Alias: caml_nativeint_format
 function caml_format_int(fmt, i) {
   if (caml_jsbytes_of_string(fmt) === "%d")
     return caml_string_of_jsbytes("" + i);
@@ -97,6 +99,8 @@ function caml_parse_digit(c) {
 //Provides: caml_int_of_string (const)
 //Requires: caml_ml_string_length, caml_string_unsafe_get
 //Requires: caml_parse_sign_and_base, caml_parse_digit, caml_failwith
+//Alias: caml_int32_of_string
+//Alias: caml_nativeint_of_string
 function caml_int_of_string(s) {
   var r = caml_parse_sign_and_base(s);
   var i = r[0],
@@ -129,19 +133,28 @@ function caml_int_of_string(s) {
 }
 
 //Provides: caml_mul const
+//Alias: caml_int32_mul
+//Alias: caml_nativeint_mul
+//Alias: %int_mul
 function caml_mul(a, b) {
   return Math.imul(a, b);
 }
 
 //Provides: caml_div
 //Requires: caml_raise_zero_divide
+//Alias: caml_int32_div
+//Alias: caml_nativeint_div
+//Alias: %int_div
 function caml_div(x, y) {
   if (y === 0) caml_raise_zero_divide();
   return (x / y) | 0;
 }
 
 //Provides: caml_mod
 //Requires: caml_raise_zero_divide
+//Alias: caml_int32_mod
+//Alias: caml_nativeint_mod
+//Alias: %int_mod
 function caml_mod(x, y) {
   if (y === 0) caml_raise_zero_divide();
   return x % y;
@@ -152,6 +165,7 @@ function caml_bswap16(x) {
   return ((x & 0x00ff) << 8) | ((x & 0xff00) >> 8);
 }
 //Provides: caml_int32_bswap
+//Alias: caml_nativeint_bswap
 function caml_int32_bswap(x) {
   return (
     ((x & 0x000000ff) << 24) |