revert backend change: no more typ_int32&typ_int64

Author: alanechang

backend/cmm.ml

@@ -26,11 +26,6 @@ let typ_void = ([||] : machtype_component array)
 let typ_val = [|Val|]
 let typ_addr = [|Addr|]
 let typ_int = [|Int|]
-let typ_int32 = [|Int|]
-(* XXX ASZ: What layouts version does this go with? *)
-(* CR layouts XXX ASZ: Change [typ_int32] to fit in a 32-bit register, rather
-   than taking up a full 64-bit one. *)
-let typ_int64 = if Arch.size_int = 4 then [|Int;Int|] else [|Int|]
 let typ_float = [|Float|]
 let typ_vec128 = [|Vec128|]
 
@@ -99,8 +94,8 @@ type exttype =
 
 let machtype_of_exttype = function
   | XInt -> typ_int
-  | XInt32 -> typ_int32
-  | XInt64 -> typ_int64
+  | XInt32 -> typ_int
+  | XInt64 -> typ_int
   | XFloat -> typ_float
   | XVec128 -> typ_vec128
 

backend/cmm.mli

@@ -54,8 +54,6 @@ val typ_void: machtype
 val typ_val: machtype
 val typ_addr: machtype
 val typ_int: machtype
-val typ_int32: machtype
-val typ_int64: machtype
 val typ_float: machtype
 val typ_vec128: machtype
 

backend/cmm_helpers.ml

@@ -1125,11 +1125,6 @@ module Extended_machtype = struct
 
   let typ_any_int = [| Extended_machtype_component.Any_int |]
 
-  (* XXX ASZ: What layouts version does this go with? *)
-  (* CR layouts XXX ASZ: Change this to fit in a 32-bit register, rather than
-     taking up a full 64-bit one. *)
-  let typ_int32 = [| Extended_machtype_component.Any_int |]
-
   let typ_int64 = [| Extended_machtype_component.Any_int |]
 
   let typ_float = [| Extended_machtype_component.Float |]

backend/cmm_helpers.mli

@@ -395,8 +395,6 @@ module Extended_machtype : sig
 
   val typ_any_int : t
 
-  val typ_int32 : t
-
   val typ_int64 : t
 
   val typ_float : t

backend/cmmgen.ml

@@ -424,9 +424,7 @@ let machtype_of_sort (s : Jkind.Sort.const) =
   match s with
   | Value -> typ_val
   | Float64 -> typ_float
-  | Word -> typ_int
-  | Bits32 -> typ_int32
-  | Bits64 -> typ_int64
+  | Word | Bits32 | Bits64 -> typ_int
   | Void -> Misc.fatal_error "Cmmgen.machtype_of_sort: void encountered"
 
 let rec is_unboxed_number_cmm = function

ocaml/asmcomp/cmm.ml

@@ -25,11 +25,6 @@ let typ_void = ([||] : machtype_component array)
 let typ_val = [|Val|]
 let typ_addr = [|Addr|]
 let typ_int = [|Int|]
-let typ_int32 = [|Int|]
-(* XXX ASZ: What layouts version does this go with? *)
-(* CR layouts XXX ASZ: Change [typ_int32] to fit in a 32-bit register, rather
-   than taking up a full 64-bit one. *)
-let typ_int64 = if Arch.size_int = 4 then [|Int;Int|] else [|Int|]
 let typ_float = [|Float|]
 
 (** [machtype_component]s are partially ordered as follows:

ocaml/asmcomp/cmm.mli

@@ -53,8 +53,6 @@ val typ_void: machtype
 val typ_val: machtype
 val typ_addr: machtype
 val typ_int: machtype
-val typ_int32: machtype
-val typ_int64: machtype
 val typ_float: machtype
 
 (** Least upper bound of two [machtype_component]s. *)

ocaml/asmcomp/cmm_helpers.ml

@@ -912,11 +912,6 @@ module Extended_machtype = struct
 
   let typ_int64 = [| Extended_machtype_component.Any_int |]
 
-  (* XXX ASZ: What layouts version does this go with? *)
-  (* CR layouts XXX ASZ: Change this to fit in a 32-bit register, rather than
-     taking up a full 64-bit one. *)
-  let typ_int32 = [| Extended_machtype_component.Any_int |]
-
   let typ_float = [| Extended_machtype_component.Float |]
 
   let typ_void = [||]

ocaml/asmcomp/cmm_helpers.mli

@@ -311,8 +311,6 @@ module Extended_machtype : sig
 
   val typ_any_int : t
 
-  val typ_int32 : t
-
   val typ_int64 : t
 
   val typ_float : t

ocaml/asmcomp/cmmgen.ml

@@ -364,9 +364,7 @@ let machtype_of_sort (s : Jkind.Sort.const) =
   match s with
   | Value -> typ_val
   | Float64 -> typ_float
-  | Word -> typ_int
-  | Bits32 -> typ_int32
-  | Bits64 -> typ_int64
+  | Word | Bits32 | Bits64 -> typ_int
   | Void -> Misc.fatal_error "Cmmgen.machtype_of_sort: void encountered"
 
 let is_unboxed_number_cmm ~strict cmm =