Merge branch 'mppa-cse2' of gricad-gitlab.univ-grenoble-alpes.fr:sixcy/CompCert into mppa-work

3 files changed, 47 insertions, 1 deletions

diff --git a/cparser/Machine.ml b/cparser/Machine.ml
index 97bedb3b..193d83c4 100644
--- a/cparser/Machine.ml
+++ b/cparser/Machine.ml
@@ -18,6 +18,7 @@
 type struct_passing_style =
   | SP_ref_callee                       (* by reference, callee takes copy *)
   | SP_ref_caller                       (* by reference, caller takes copy *)
+  | SP_value32_ref_callee               (* by value if <= 32 bits, by ref_callee otherwise *)
   | SP_split_args                       (* by value, as a sequence of ints *)
 
 type struct_return_style =
@@ -237,6 +238,40 @@ let rv64 =
                    struct_passing_style = SP_ref_callee; (* Wrong *)
                    struct_return_style = SR_ref } (* to check *)
 
+let mppa_k1c =
+  { name = "k1c";
+    char_signed = true;
+    wchar_signed = true;
+    sizeof_ptr = 8;
+    sizeof_short = 2;
+    sizeof_int = 4;
+    sizeof_long = 8;
+    sizeof_longlong = 8;
+    sizeof_float = 4;
+    sizeof_double = 8;
+    sizeof_longdouble = 8;
+    sizeof_void = None; (* What is this for ? *)
+    sizeof_fun = None; (* What is this for ? *)
+    sizeof_wchar = 4;
+    sizeof_size_t = 8;
+    sizeof_ptrdiff_t = 8;
+    sizeof_intreg = 8; (* What is this for ? *)
+    alignof_ptr = 8;
+    alignof_short = 2;
+    alignof_int = 4;
+    alignof_long = 8;
+    alignof_longlong = 8;
+    alignof_float = 4;
+    alignof_double = 8;
+    alignof_longdouble = 8;
+    alignof_void = None; (* what is this for ? *)
+    alignof_fun = None; (* what is this for ? *)
+    bigendian = false;
+    bitfields_msb_first = false; (* TO CHECK *)
+    supports_unaligned_accesses = true;
+    struct_passing_style = SP_value32_ref_callee;
+    struct_return_style = SR_int1to4 }
+
 let aarch64 =
   { i32lpll64 with name = "aarch64";
                    struct_passing_style = SP_ref_callee; (* Wrong *)
diff --git a/cparser/Machine.mli b/cparser/Machine.mli
index ca7de17b..ea25c4f6 100644
--- a/cparser/Machine.mli
+++ b/cparser/Machine.mli
@@ -17,6 +17,7 @@
 type struct_passing_style =
   | SP_ref_callee                       (* by reference, callee takes copy *)
   | SP_ref_caller                       (* by reference, caller takes copy *)
+  | SP_value32_ref_callee               (* by value if <= 32 bits, by ref_callee otherwise *)
   | SP_split_args                       (* by value, as a sequence of ints *)
 
 type struct_return_style =
@@ -86,6 +87,7 @@ val arm_littleendian : t
 val arm_bigendian : t
 val rv32 : t
 val rv64 : t
+val mppa_k1c : t
 val aarch64 : t
 
 val gcc_extensions : t -> t
diff --git a/cparser/StructPassing.ml b/cparser/StructPassing.ml
index 5c6454f0..3aff090e 100644
--- a/cparser/StructPassing.ml
+++ b/cparser/StructPassing.ml
@@ -68,7 +68,16 @@ let classify_param env ty =
     match !struct_passing_style with
     | SP_ref_callee -> Param_unchanged
     | SP_ref_caller -> Param_ref_caller
-    | _ ->
+    | SP_value32_ref_callee ->
+      (match sizeof env ty, alignof env ty with
+      | Some sz, Some al ->
+          if (sz <= 4) then
+            Param_flattened ((sz+3)/4, sz, al) (* FIXME - why (sz+3)/4 ? *)
+          else
+            Param_unchanged
+      | _, _ -> Param_unchanged (* when parsing prototype with incomplete structure definition *)
+      )
+    | SP_split_args ->
       match sizeof env ty, alignof env ty with
       | Some sz, Some al ->
           Param_flattened ((sz + 3) / 4, sz, al)