Compiler: consume hints for unsafe string/bytes/ba get/set

Author: hhugo

compiler/lib/parse_bytecode.ml

@@ -1971,7 +1971,23 @@ and compile infos pc state (instrs : instr list) =
         let y = State.accu state in
         let z = State.peek 0 state in
         let x, state = State.fresh_var state in
-
+        let prim =
+          match prim with
+          | "caml_ba_uint8_get16"
+          | "caml_ba_uint8_get32"
+          | "caml_ba_uint8_get64"
+          | "caml_string_get16"
+          | "caml_string_get32"
+          | "caml_string_get64"
+          | "caml_bytes_get16"
+          | "caml_bytes_get32"
+          | "caml_bytes_get64" ->
+              let hints = Hints.find infos.hints pc in
+              if List.mem ~eq:Hints.equal Hints.Hint_unsafe hints
+              then prim ^ "u"
+              else prim
+          | _ -> prim
+        in
         if debug_parser ()
         then
           Format.printf
@@ -1994,7 +2010,20 @@ and compile infos pc state (instrs : instr list) =
         let z = State.peek 0 state in
         let t = State.peek 1 state in
         let x, state = State.fresh_var state in
-
+        let prim =
+          match prim with
+          | "caml_ba_uint8_set16"
+          | "caml_ba_uint8_set32"
+          | "caml_ba_uint8_set64"
+          | "caml_bytes_set16"
+          | "caml_bytes_set32"
+          | "caml_bytes_set64" ->
+              let hints = Hints.find infos.hints pc in
+              if List.mem ~eq:Hints.equal Hints.Hint_unsafe hints
+              then prim ^ "u"
+              else prim
+          | _ -> prim
+        in
         if debug_parser ()
         then
           Format.printf

runtime/js/bigarray.js

@@ -548,6 +548,14 @@ function caml_ba_get_generic(ba, i) {
   return ba.get(ofs);
 }
 
+
+//Provides: caml_ba_uint8_get16u
+function caml_ba_uint8_get16u(ba, i0) {
+  var ofs = ba.offset(i0);
+  var b1 = ba.get(ofs);
+  var b2 = ba.get(ofs + 1);
+  return b1 | (b2 << 8);
+}
 //Provides: caml_ba_uint8_get16
 //Requires: caml_array_bound_error
 function caml_ba_uint8_get16(ba, i0) {
@@ -558,6 +566,16 @@ function caml_ba_uint8_get16(ba, i0) {
   return b1 | (b2 << 8);
 }
 
+//Provides: caml_ba_uint8_get32u
+function caml_ba_uint8_get32u(ba, i0) {
+  var ofs = ba.offset(i0);
+  var b1 = ba.get(ofs + 0);
+  var b2 = ba.get(ofs + 1);
+  var b3 = ba.get(ofs + 2);
+  var b4 = ba.get(ofs + 3);
+  return (b1 << 0) | (b2 << 8) | (b3 << 16) | (b4 << 24);
+}
+
 //Provides: caml_ba_uint8_get32
 //Requires: caml_array_bound_error
 function caml_ba_uint8_get32(ba, i0) {
@@ -570,6 +588,21 @@ function caml_ba_uint8_get32(ba, i0) {
   return (b1 << 0) | (b2 << 8) | (b3 << 16) | (b4 << 24);
 }
 
+//Provides: caml_ba_uint8_get64u
+//Requires: caml_int64_of_bytes
+function caml_ba_uint8_get64u(ba, i0) {
+  var ofs = ba.offset(i0);
+  var b1 = ba.get(ofs + 0);
+  var b2 = ba.get(ofs + 1);
+  var b3 = ba.get(ofs + 2);
+  var b4 = ba.get(ofs + 3);
+  var b5 = ba.get(ofs + 4);
+  var b6 = ba.get(ofs + 5);
+  var b7 = ba.get(ofs + 6);
+  var b8 = ba.get(ofs + 7);
+  return caml_int64_of_bytes([b8, b7, b6, b5, b4, b3, b2, b1]);
+}
+
 //Provides: caml_ba_uint8_get64
 //Requires: caml_array_bound_error, caml_int64_of_bytes
 function caml_ba_uint8_get64(ba, i0) {
@@ -608,6 +641,14 @@ function caml_ba_set_generic(ba, i, v) {
   return 0;
 }
 
+//Provides: caml_ba_uint8_set16u
+function caml_ba_uint8_set16u(ba, i0, v) {
+  var ofs = ba.offset(i0);
+  ba.set(ofs + 0, v & 0xff);
+  ba.set(ofs + 1, (v >>> 8) & 0xff);
+  return 0;
+}
+
 //Provides: caml_ba_uint8_set16
 //Requires: caml_array_bound_error
 function caml_ba_uint8_set16(ba, i0, v) {
@@ -618,6 +659,15 @@ function caml_ba_uint8_set16(ba, i0, v) {
   return 0;
 }
 
+//Provides: caml_ba_uint8_set32u
+function caml_ba_uint8_set32u(ba, i0, v) {
+  var ofs = ba.offset(i0);
+  ba.set(ofs + 0, v & 0xff);
+  ba.set(ofs + 1, (v >>> 8) & 0xff);
+  ba.set(ofs + 2, (v >>> 16) & 0xff);
+  ba.set(ofs + 3, (v >>> 24) & 0xff);
+  return 0;
+}
 //Provides: caml_ba_uint8_set32
 //Requires: caml_array_bound_error
 function caml_ba_uint8_set32(ba, i0, v) {
@@ -630,6 +680,15 @@ function caml_ba_uint8_set32(ba, i0, v) {
   return 0;
 }
 
+//Provides: caml_ba_uint8_set64u
+//Requires: caml_int64_to_bytes
+function caml_ba_uint8_set64u(ba, i0, v) {
+  var ofs = ba.offset(i0);
+  var v = caml_int64_to_bytes(v);
+  for (var i = 0; i < 8; i++) ba.set(ofs + i, v[7 - i]);
+  return 0;
+}
+
 //Provides: caml_ba_uint8_set64
 //Requires: caml_array_bound_error, caml_int64_to_bytes
 function caml_ba_uint8_set64(ba, i0, v) {

runtime/js/mlBytes.js

@@ -142,29 +142,50 @@ function caml_string_get(s, i) {
 }
 
 //Provides: caml_string_get16
-//Requires: caml_string_unsafe_get, caml_string_bound_error
+//Requires: caml_string_bound_error
 //Requires: caml_ml_string_length
+//Requires: caml_string_get16u
 function caml_string_get16(s, i) {
   if (i >>> 0 >= caml_ml_string_length(s) - 1) caml_string_bound_error();
+  return caml_string_get16u(s,i);
+}
+
+//Provides: caml_string_get16u
+//Requires: caml_string_unsafe_get
+function caml_string_get16u(s, i) {
   var b1 = caml_string_unsafe_get(s, i),
     b2 = caml_string_unsafe_get(s, i + 1);
   return (b2 << 8) | b1;
 }
 
 //Provides: caml_bytes_get16
-//Requires: caml_bytes_unsafe_get, caml_bytes_bound_error
+//Requires: caml_bytes_bound_error
+//Requires: caml_bytes_get16u
 function caml_bytes_get16(s, i) {
   if (i >>> 0 >= s.l - 1) caml_bytes_bound_error();
+  return caml_bytes_get16u(s,i)
+}
+
+//Provides: caml_bytes_get16u
+//Requires: caml_bytes_unsafe_get
+function caml_bytes_get16u(s, i) {
   var b1 = caml_bytes_unsafe_get(s, i),
     b2 = caml_bytes_unsafe_get(s, i + 1);
   return (b2 << 8) | b1;
 }
 
 //Provides: caml_string_get32
-//Requires: caml_string_unsafe_get, caml_string_bound_error
+//Requires: caml_string_bound_error
 //Requires: caml_ml_string_length
+//Requires: caml_string_get32u
 function caml_string_get32(s, i) {
   if (i >>> 0 >= caml_ml_string_length(s) - 3) caml_string_bound_error();
+  return caml_string_get32u(s,i);
+}
+
+//Provides: caml_string_get32u
+//Requires: caml_string_unsafe_get
+function caml_string_get32u(s, i) {
   var b1 = caml_string_unsafe_get(s, i),
     b2 = caml_string_unsafe_get(s, i + 1),
     b3 = caml_string_unsafe_get(s, i + 2),
@@ -173,9 +194,16 @@ function caml_string_get32(s, i) {
 }
 
 //Provides: caml_bytes_get32
-//Requires: caml_bytes_unsafe_get, caml_bytes_bound_error
+//Requires: caml_bytes_bound_error
+//Requires: caml_bytes_get32u
 function caml_bytes_get32(s, i) {
   if (i >>> 0 >= s.l - 3) caml_bytes_bound_error();
+  return caml_bytes_get32u(s,i)
+}
+
+//Provides: caml_bytes_get32u
+//Requires: caml_bytes_unsafe_get
+function caml_bytes_get32u(s, i) {
   var b1 = caml_bytes_unsafe_get(s, i),
     b2 = caml_bytes_unsafe_get(s, i + 1),
     b3 = caml_bytes_unsafe_get(s, i + 2),
@@ -184,11 +212,18 @@ function caml_bytes_get32(s, i) {
 }
 
 //Provides: caml_string_get64
-//Requires: caml_string_unsafe_get, caml_string_bound_error
-//Requires: caml_int64_of_bytes
+//Requires: caml_string_bound_error
 //Requires: caml_ml_string_length
+//Requires: caml_string_get64u
 function caml_string_get64(s, i) {
   if (i >>> 0 >= caml_ml_string_length(s) - 7) caml_string_bound_error();
+  return caml_string_get64u(s,i);
+}
+
+//Provides: caml_string_get64u
+//Requires: caml_string_unsafe_get
+//Requires: caml_int64_of_bytes
+function caml_string_get64u(s, i) {
   var a = new Array(8);
   for (var j = 0; j < 8; j++) {
     a[7 - j] = caml_string_unsafe_get(s, i + j);
@@ -197,10 +232,17 @@ function caml_string_get64(s, i) {
 }
 
 //Provides: caml_bytes_get64
-//Requires: caml_bytes_unsafe_get, caml_bytes_bound_error
-//Requires: caml_int64_of_bytes
+//Requires: caml_bytes_bound_error
+//Requires: caml_bytes_get64u
 function caml_bytes_get64(s, i) {
   if (i >>> 0 >= s.l - 7) caml_bytes_bound_error();
+  return caml_bytes_get64u(s,i)
+}
+
+//Provides: caml_bytes_get64u
+//Requires: caml_bytes_unsafe_get
+//Requires: caml_int64_of_bytes
+function caml_bytes_get64u(s, i) {
   var a = new Array(8);
   for (var j = 0; j < 8; j++) {
     a[7 - j] = caml_bytes_unsafe_get(s, i + j);
@@ -231,9 +273,16 @@ function caml_string_set(s, i, c) {
 }
 
 //Provides: caml_bytes_set16
-//Requires: caml_bytes_bound_error, caml_bytes_unsafe_set
+//Requires: caml_bytes_bound_error
+//Requires: caml_bytes_set16u
 function caml_bytes_set16(s, i, i16) {
   if (i >>> 0 >= s.l - 1) caml_bytes_bound_error();
+  return caml_bytes_set16u(s,i,i16);
+}
+
+//Provides: caml_bytes_set16u
+//Requires: caml_bytes_unsafe_set
+function caml_bytes_set16u(s, i, i16) {
   var b2 = 0xff & (i16 >> 8),
     b1 = 0xff & i16;
   caml_bytes_unsafe_set(s, i + 0, b1);
@@ -242,9 +291,16 @@ function caml_bytes_set16(s, i, i16) {
 }
 
 //Provides: caml_bytes_set32
-//Requires: caml_bytes_bound_error, caml_bytes_unsafe_set
+//Requires: caml_bytes_bound_error
+//Requires: caml_bytes_set32u
 function caml_bytes_set32(s, i, i32) {
   if (i >>> 0 >= s.l - 3) caml_bytes_bound_error();
+  return caml_bytes_set32u(s,i,i32);
+}
+
+//Provides: caml_bytes_set32u
+//Requires: caml_bytes_unsafe_set
+function caml_bytes_set32u(s, i, i32) {
   var b4 = 0xff & (i32 >> 24),
     b3 = 0xff & (i32 >> 16),
     b2 = 0xff & (i32 >> 8),
@@ -257,10 +313,17 @@ function caml_bytes_set32(s, i, i32) {
 }
 
 //Provides: caml_bytes_set64
-//Requires: caml_bytes_bound_error, caml_bytes_unsafe_set
-//Requires: caml_int64_to_bytes
+//Requires: caml_bytes_bound_error
+//Requires: caml_bytes_set64u
 function caml_bytes_set64(s, i, i64) {
   if (i >>> 0 >= s.l - 7) caml_bytes_bound_error();
+  return caml_bytes_set64u(s,i,i64);
+}
+
+//Provides: caml_bytes_set64u
+//Requires: caml_bytes_unsafe_set
+//Requires: caml_int64_to_bytes
+function caml_bytes_set64u(s, i, i64) {
   var a = caml_int64_to_bytes(i64);
   for (var j = 0; j < 8; j++) {
     caml_bytes_unsafe_set(s, i + 7 - j, a[j]);