tweak

Author: bobzhang

jscomp/runtime/caml_int64.ml

@@ -51,7 +51,7 @@ external unsafe_to_int64 : t -> int64 = "%identity"
 external unsafe_of_int64 : int64 -> t = "%identity"
 
 
-let mk ~lo ~hi =  {lo = lo >>>~ 0 ; hi}
+let [@inline] mk ~lo ~hi =  {lo = lo >>>~ 0 ; hi}
 let min_int =  mk  ~lo: 0 ~hi:(0x80000000)
 (* The high bits are signed 0x80000000 |~ 0 *)
 

lib/es6/caml_int64.js

@@ -8,15 +8,30 @@ function mk(lo, hi) {
         ];
 }
 
-var min_int = mk(0, -2147483648);
-
-var max_int = mk(-1, 2147483647);
-
-var one = mk(1, 0);
-
-var zero = mk(0, 0);
-
-var neg_one = mk(-1, -1);
+var min_int = [
+  -2147483648,
+  0
+];
+
+var max_int = [
+  2147483647,
+  4294967295
+];
+
+var one = [
+  0,
+  1
+];
+
+var zero = [
+  0,
+  0
+];
+
+var neg_one = [
+  -1,
+  4294967295
+];
 
 function neg_signed(x) {
   return (x & -2147483648) !== 0;
@@ -30,23 +45,35 @@ function succ(param) {
   var x_lo = param[1];
   var x_hi = param[0];
   var lo = x_lo + 1 | 0;
-  return mk(lo, x_hi + (
-              lo === 0 ? 1 : 0
-            ) | 0);
+  var hi = x_hi + (
+    lo === 0 ? 1 : 0
+  ) | 0;
+  return [
+          hi,
+          (lo >>> 0)
+        ];
 }
 
 function neg(param) {
   var other_lo = (param[1] ^ -1) + 1 | 0;
-  return mk(other_lo, (param[0] ^ -1) + (
-              other_lo === 0 ? 1 : 0
-            ) | 0);
+  var hi = (param[0] ^ -1) + (
+    other_lo === 0 ? 1 : 0
+  ) | 0;
+  return [
+          hi,
+          (other_lo >>> 0)
+        ];
 }
 
 function add_aux(param, y_lo, y_hi) {
   var x_lo = param[1];
   var lo = x_lo + y_lo | 0;
   var overflow = neg_signed(x_lo) && (neg_signed(y_lo) || non_neg_signed(lo)) || neg_signed(y_lo) && non_neg_signed(lo) ? 1 : 0;
-  return mk(lo, param[0] + y_hi + overflow | 0);
+  var hi = param[0] + y_hi + overflow | 0;
+  return [
+          hi,
+          (lo >>> 0)
+        ];
 }
 
 function add(self, param) {
@@ -103,10 +130,16 @@ function lsl_(x, numBits) {
   }
   var lo = x[1];
   if (numBits >= 32) {
-    return mk(0, (lo << (numBits - 32 | 0)));
-  } else {
-    return mk((lo << numBits), (lo >>> (32 - numBits | 0)) | (x[0] << numBits));
+    return [
+            (lo << (numBits - 32 | 0)),
+            0
+          ];
   }
+  var hi = (lo >>> (32 - numBits | 0)) | (x[0] << numBits);
+  return [
+          hi,
+          ((lo << numBits) >>> 0)
+        ];
 }
 
 function lsr_(x, numBits) {
@@ -116,24 +149,42 @@ function lsr_(x, numBits) {
   var hi = x[0];
   var offset = numBits - 32 | 0;
   if (offset === 0) {
-    return mk(hi, 0);
-  } else if (offset > 0) {
-    return mk((hi >>> offset), 0);
-  } else {
-    return mk((hi << (-offset | 0)) | (x[1] >>> numBits), (hi >>> numBits));
+    return [
+            0,
+            (hi >>> 0)
+          ];
   }
+  if (offset > 0) {
+    var lo = (hi >>> offset);
+    return [
+            0,
+            (lo >>> 0)
+          ];
+  }
+  var hi$1 = (hi >>> numBits);
+  var lo$1 = (hi << (-offset | 0)) | (x[1] >>> numBits);
+  return [
+          hi$1,
+          (lo$1 >>> 0)
+        ];
 }
 
 function asr_(x, numBits) {
   if (numBits === 0) {
     return x;
   }
   var hi = x[0];
-  if (numBits < 32) {
-    return mk((hi << (32 - numBits | 0)) | (x[1] >>> numBits), (hi >> numBits));
-  } else {
-    return mk((hi >> (numBits - 32 | 0)), hi >= 0 ? 0 : -1);
+  if (numBits >= 32) {
+    return [
+            hi >= 0 ? 0 : -1,
+            ((hi >> (numBits - 32 | 0)) >>> 0)
+          ];
   }
+  var lo = (hi << (32 - numBits | 0)) | (x[1] >>> numBits);
+  return [
+          (hi >> numBits),
+          (lo >>> 0)
+        ];
 }
 
 function is_zero(param) {
@@ -223,7 +274,10 @@ function mul(_this, _other) {
         c48 = c48 + (c32 >>> 16);
         c32 = c32 & 65535;
         c48 = c48 + (a48 * b00 + a32 * b16 + a16 * b32 + a00 * b48) & 65535;
-        return mk(c00 & 65535 | ((c16 & 65535) << 16), c32 | (c48 << 16));
+        return [
+                c32 | (c48 << 16),
+                ((c00 & 65535 | ((c16 & 65535) << 16)) >>> 0)
+              ];
       }
 
     }
@@ -236,15 +290,24 @@ function mul(_this, _other) {
 }
 
 function xor(param, param$1) {
-  return mk(param[1] ^ param$1[1], param[0] ^ param$1[0]);
+  return [
+          param[0] ^ param$1[0],
+          ((param[1] ^ param$1[1]) >>> 0)
+        ];
 }
 
 function or_(param, param$1) {
-  return mk(param[1] | param$1[1], param[0] | param$1[0]);
+  return [
+          param[0] | param$1[0],
+          ((param[1] | param$1[1]) >>> 0)
+        ];
 }
 
 function and_(param, param$1) {
-  return mk(param[1] & param$1[1], param[0] & param$1[0]);
+  return [
+          param[0] & param$1[0],
+          ((param[1] & param$1[1]) >>> 0)
+        ];
 }
 
 function ge(param, param$1) {
@@ -304,15 +367,22 @@ function to_float(param) {
 function of_float(x) {
   if (isNaN(x) || !isFinite(x)) {
     return zero;
-  } else if (x <= -9.22337203685477581e+18) {
+  }
+  if (x <= -9.22337203685477581e+18) {
     return min_int;
-  } else if (x + 1 >= 9.22337203685477581e+18) {
+  }
+  if (x + 1 >= 9.22337203685477581e+18) {
     return max_int;
-  } else if (x < 0) {
+  }
+  if (x < 0) {
     return neg(of_float(-x));
-  } else {
-    return mk(x % 4294967296 | 0, x / 4294967296 | 0);
   }
+  var hi = x / 4294967296 | 0;
+  var lo = x % 4294967296 | 0;
+  return [
+          hi,
+          (lo >>> 0)
+        ];
 }
 
 function isSafeInteger(param) {
@@ -499,7 +569,10 @@ function compare(self, other) {
 }
 
 function of_int32(lo) {
-  return mk(lo, lo < 0 ? -1 : 0);
+  return [
+          lo < 0 ? -1 : 0,
+          (lo >>> 0)
+        ];
 }
 
 function to_int32(x) {
@@ -543,7 +616,10 @@ function float_of_bits(x) {
 
 function bits_of_float(x) {
   var match = (function(x){return new Int32Array(new Float64Array([x]).buffer)})(x);
-  return mk(match[0], match[1]);
+  return [
+          match[1],
+          (match[0] >>> 0)
+        ];
 }
 
 export {