diff options
| author | David Monniaux <david.monniaux@univ-grenoble-alpes.fr> | 2019-11-13 14:14:17 +0100 |
|---|---|---|
| committer | David Monniaux <david.monniaux@univ-grenoble-alpes.fr> | 2019-11-13 14:14:17 +0100 |
| commit | f2cf6d4e0600d4a58677a7531e8516a37fe1d0da (patch) | |
| tree | adf79d4780ffb2aa8733a70da461239270e5c21e /cparser | |
| parent | 24406a351e9d64c2953b0b9fc7ef0b3d79db9b85 (diff) | |
| parent | 847554275608bafcbfad635684e588501e00ac31 (diff) | |
| download | compcert-kvx-f2cf6d4e0600d4a58677a7531e8516a37fe1d0da.tar.gz compcert-kvx-f2cf6d4e0600d4a58677a7531e8516a37fe1d0da.zip | |
Merge remote-tracking branch 'origin/mppa-work' into mppa-work-upstream-merge
Diffstat (limited to 'cparser')
| -rw-r--r-- | cparser/Machine.ml | 6 | ||||
| -rw-r--r-- | cparser/Machine.mli | 1 | ||||
| -rw-r--r-- | cparser/StructPassing.ml | 11 |
3 files changed, 15 insertions, 3 deletions
diff --git a/cparser/Machine.ml b/cparser/Machine.ml index 0112a5ec..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 = @@ -268,8 +269,9 @@ let mppa_k1c = bigendian = false; bitfields_msb_first = false; (* TO CHECK *) supports_unaligned_accesses = true; - struct_passing_style = SP_split_args; - struct_return_style = SR_int1248 } + 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 31726d7f..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 = 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) |