Squashed commit of the following:

    Unify boxed and unboxed primitive operations.

    Also adds an Unboxed_int type.

Author: jvanburen

backend/cmm.ml

@@ -146,9 +146,9 @@ type integer_comparison = Lambda.integer_comparison =
   | Cle
   | Cge
 
-let negate_integer_comparison = Lambda.negate_integer_comparison
+let negate_integer_comparison = Scalar.Integer_comparison.negate
 
-let swap_integer_comparison = Lambda.swap_integer_comparison
+let swap_integer_comparison = Scalar.Integer_comparison.swap
 
 (* With floats [not (x < y)] is not the same as [x >= y] due to NaNs, so we
    provide additional comparisons to represent the negations.*)
@@ -164,9 +164,9 @@ type float_comparison = Lambda.float_comparison =
   | CFge
   | CFnge
 
-let negate_float_comparison = Lambda.negate_float_comparison
+let negate_float_comparison = Scalar.Float_comparison.negate
 
-let swap_float_comparison = Lambda.swap_float_comparison
+let swap_float_comparison = Scalar.Float_comparison.swap
 
 type label = Label.t
 

backend/cmm_helpers.ml

@@ -3544,44 +3544,31 @@ let addr_array_length arg dbg =
    to Arbitrary_effects and Has_coeffects, resp. Check if this can be improved
    (e.g., bswap). *)
 
-let bbswap bi arg dbg =
-  match (bi : Primitive.unboxed_integer) with
-  | Unboxed_int8 -> arg
-  | _ ->
-    let bitwidth : Cmm.bswap_bitwidth =
-      match (bi : Primitive.unboxed_integer) with
-      | Unboxed_nativeint -> if size_int = 4 then Thirtytwo else Sixtyfour
-      | Unboxed_int8 -> assert false
-      | Unboxed_int16 -> Sixteen
-      | Unboxed_int32 -> Thirtytwo
-      | Unboxed_int64 -> Sixtyfour
+let bbswap (bitwidth : Cmm.bswap_bitwidth) arg dbg =
+  let op = Cbswap { bitwidth } in
+  if Proc.operation_supported op
+     && not (bitwidth = Cmm.Sixtyfour && size_int < 8)
+  then Cop (op, [arg], dbg)
+  else
+    let func, tyarg =
+      match bitwidth with
+      | Sixteen -> "caml_bswap16_direct", XInt16
+      | Thirtytwo -> "caml_int32_direct_bswap", XInt32
+      | Sixtyfour -> "caml_int64_direct_bswap", XInt64
     in
-    let op = Cbswap { bitwidth } in
-    if (bi = Primitive.Unboxed_int64 && size_int = 4)
-       || not (Proc.operation_supported op)
-    then
-      let func, tyarg =
-        match (bi : Primitive.unboxed_integer) with
-        | Unboxed_int8 -> assert false
-        | Unboxed_int16 -> "caml_bswap16_direct", XInt16
-        | Unboxed_int32 -> "caml_int32_direct_bswap", XInt32
-        | Unboxed_nativeint -> "caml_nativeint_direct_bswap", XInt
-        | Unboxed_int64 -> "caml_int64_direct_bswap", XInt64
-      in
-      Cop
-        ( Cextcall
-            { func;
-              builtin = false;
-              returns = true;
-              effects = Arbitrary_effects;
-              coeffects = Has_coeffects;
-              ty = typ_int;
-              alloc = false;
-              ty_args = [tyarg]
-            },
-          [arg],
-          dbg )
-    else Cop (op, [arg], dbg)
+    Cop
+      ( Cextcall
+          { func;
+            builtin = false;
+            returns = true;
+            effects = No_effects;
+            coeffects = No_coeffects;
+            ty = typ_int;
+            alloc = false;
+            ty_args = [tyarg]
+          },
+        [arg],
+        dbg )
 
 type binary_primitive = expression -> expression -> Debuginfo.t -> expression
 

backend/cmm_helpers.mli

@@ -455,7 +455,7 @@ val negint : unary_primitive
 val addr_array_length : unary_primitive
 
 (** Byte swap primitive Operates on Cmm integers (unboxed values) *)
-val bbswap : Primitive.unboxed_integer -> unary_primitive
+val bbswap : bswap_bitwidth -> unary_primitive
 
 type binary_primitive = expression -> expression -> Debuginfo.t -> expression