Commit 5651bea284ad0822eafe768e3443c2f4d7da2c8f
2021-06-15T15:19:26
2021-06-15 Jakub Jelinek <jakub@redhat.com> * src/x86/ffi64.c (classify_argument): For FFI_TYPE_STRUCT set words to number of words needed for type->size + byte_offset bytes rather than just type->size bytes. Compute pos before the loop and check total size of the structure. * testsuite/libffi.call/nested_struct12.c: New test.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145
diff --git a/src/x86/ffi64.c b/src/x86/ffi64.c
index 5264cdf..438b374 100644
--- a/src/x86/ffi64.c
+++ b/src/x86/ffi64.c
@@ -218,7 +218,8 @@ classify_argument (ffi_type *type, enum x86_64_reg_class classes[],
case FFI_TYPE_STRUCT:
{
const size_t UNITS_PER_WORD = 8;
- size_t words = (type->size + UNITS_PER_WORD - 1) / UNITS_PER_WORD;
+ size_t words = (type->size + byte_offset + UNITS_PER_WORD - 1)
+ / UNITS_PER_WORD;
ffi_type **ptr;
unsigned int i;
enum x86_64_reg_class subclasses[MAX_CLASSES];
@@ -242,14 +243,15 @@ classify_argument (ffi_type *type, enum x86_64_reg_class classes[],
/* Merge the fields of structure. */
for (ptr = type->elements; *ptr != NULL; ptr++)
{
- size_t num;
+ size_t num, pos;
byte_offset = FFI_ALIGN (byte_offset, (*ptr)->alignment);
num = classify_argument (*ptr, subclasses, byte_offset % 8);
if (num == 0)
return 0;
- for (i = 0; i < num; i++)
+ pos = byte_offset / 8;
+ for (i = 0; i < num && (i + pos) < words; i++)
{
size_t pos = byte_offset / 8;
classes[i + pos] =
diff --git a/testsuite/libffi.call/nested_struct12.c b/testsuite/libffi.call/nested_struct12.c
new file mode 100644
index 0000000..6c139b9
--- /dev/null
+++ b/testsuite/libffi.call/nested_struct12.c
@@ -0,0 +1,107 @@
+/* Area: ffi_call, closure_call
+ Purpose: Check structure passing.
+ Limitations: none.
+ PR: none.
+ Originator: <jincheng@ca.ibm.com> and <jakub@redhat.com> 20210609 */
+
+/* { dg-do run } */
+#include "ffitest.h"
+
+typedef struct A {
+ float a, b;
+} A;
+
+typedef struct B {
+ float x;
+ struct A y;
+} B;
+
+B B_fn(float b0, struct B b1)
+{
+ struct B result;
+
+ result.x = b0 + b1.x;
+ result.y.a = b0 + b1.y.a;
+ result.y.b = b0 + b1.y.b;
+
+ printf("%g %g %g %g: %g %g %g\n", b0, b1.x, b1.y.a, b1.y.b,
+ result.x, result.y.a, result.y.b);
+
+ return result;
+}
+
+static void
+B_gn(ffi_cif* cif __UNUSED__, void* resp, void** args,
+ void* userdata __UNUSED__)
+{
+ float b0;
+ struct B b1;
+
+ b0 = *(float*)(args[0]);
+ b1 = *(struct B*)(args[1]);
+
+ *(B*)resp = B_fn(b0, b1);
+}
+
+int main (void)
+{
+ ffi_cif cif;
+ void *code;
+ ffi_closure *pcl = ffi_closure_alloc(sizeof(ffi_closure), &code);
+ void* args_dbl[3];
+ ffi_type* cls_struct_fields[3];
+ ffi_type* cls_struct_fields1[3];
+ ffi_type cls_struct_type, cls_struct_type1;
+ ffi_type* dbl_arg_types[3];
+
+ float e_dbl = 12.125f;
+ struct B f_dbl = { 24.75f, { 31.625f, 32.25f } };
+
+ struct B res_dbl;
+
+ cls_struct_type.size = 0;
+ cls_struct_type.alignment = 0;
+ cls_struct_type.type = FFI_TYPE_STRUCT;
+ cls_struct_type.elements = cls_struct_fields;
+
+ cls_struct_type1.size = 0;
+ cls_struct_type1.alignment = 0;
+ cls_struct_type1.type = FFI_TYPE_STRUCT;
+ cls_struct_type1.elements = cls_struct_fields1;
+
+ cls_struct_fields[0] = &ffi_type_float;
+ cls_struct_fields[1] = &ffi_type_float;
+ cls_struct_fields[2] = NULL;
+
+ cls_struct_fields1[0] = &ffi_type_float;
+ cls_struct_fields1[1] = &cls_struct_type;
+ cls_struct_fields1[2] = NULL;
+
+
+ dbl_arg_types[0] = &ffi_type_float;
+ dbl_arg_types[1] = &cls_struct_type1;
+ dbl_arg_types[2] = NULL;
+
+ CHECK(ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 2, &cls_struct_type1,
+ dbl_arg_types) == FFI_OK);
+
+ args_dbl[0] = &e_dbl;
+ args_dbl[1] = &f_dbl;
+ args_dbl[2] = NULL;
+
+ ffi_call(&cif, FFI_FN(B_fn), &res_dbl, args_dbl);
+ /* { dg-output "12.125 24.75 31.625 32.25: 36.875 43.75 44.375" } */
+ CHECK( res_dbl.x == (e_dbl + f_dbl.x));
+ CHECK( res_dbl.y.a == (e_dbl + f_dbl.y.a));
+ CHECK( res_dbl.y.b == (e_dbl + f_dbl.y.b));
+
+ CHECK(ffi_prep_closure_loc(pcl, &cif, B_gn, NULL, code) == FFI_OK);
+
+ res_dbl = ((B(*)(float, B))(code))(e_dbl, f_dbl);
+ /* { dg-output "\n12.125 24.75 31.625 32.25: 36.875 43.75 44.375" } */
+ CHECK( res_dbl.x == (e_dbl + f_dbl.x));
+ CHECK( res_dbl.y.a == (e_dbl + f_dbl.y.a));
+ CHECK( res_dbl.y.b == (e_dbl + f_dbl.y.b));
+
+ exit(0);
+}