6e8a446083
* src/types.c (FFI_TYPEDEF, FFI_NONCONST_TYPEDEF): Merge the macros by adding another argument that controls whether the result is const or not (FFI_LDBL_CONST): Temporary macro to reduce ifdef confusion * src/prep_cif.c (ffi_prep_cif_core): Replace list of systems with new macro FFI_TARGET_SPECIFIC_STACK_SPACE_ALLOCATION * src/pa/ffitarget.h (FFI_TARGET_SPECIFIC_STACK_SPACE_ALLOCATION): Define. * src/s390/ffitarget.h (FFI_TARGET_SPECIFIC_STACK_SPACE_ALLOCATION): Define. * src/x86/ffitarget.h (FFI_TARGET_SPECIFIC_STACK_SPACE_ALLOCATION): Define. 2014-07-22 Dominik Vogt <vogt@linux.vnet.ibm.com> * doc/libffi.texi (Primitive Types): Document ffi_type_complex_float, ffi_type_complex_double and ffi_type_complex_longdouble (Complex Types): New subsection. (Complex Type Example): Ditto. * testsuite/libffi.call/cls_align_complex_double.c: New FFI_TYPE_COMPLEX test. * testsuite/libffi.call/cls_align_complex_float.c: Ditto. * testsuite/libffi.call/cls_align_complex_longdouble.c: Ditto. * testsuite/libffi.call/cls_complex_double.c: Ditto. * testsuite/libffi.call/cls_complex_float.c: Ditto. * testsuite/libffi.call/cls_complex_longdouble.c: Ditto. * testsuite/libffi.call/cls_complex_struct_double.c: Ditto. * testsuite/libffi.call/cls_complex_struct_float.c: Ditto. * testsuite/libffi.call/cls_complex_struct_longdouble.c: Ditto. * testsuite/libffi.call/cls_complex_va_double.c: Ditto. * testsuite/libffi.call/cls_complex_va_float.c: Ditto. * testsuite/libffi.call/cls_complex_va_longdouble.c: Ditto. * testsuite/libffi.call/complex_double.c: Ditto. * testsuite/libffi.call/complex_defs_double.c: Ditto. * testsuite/libffi.call/complex_float.c: Ditto. * testsuite/libffi.call/complex_defs_float.c: Ditto. * testsuite/libffi.call/complex_longdouble.c: Ditto. * testsuite/libffi.call/complex_defs_longdouble.c: Ditto. * testsuite/libffi.call/complex_int.c: Ditto. * testsuite/libffi.call/many_complex_double.c: Ditto. * testsuite/libffi.call/many_complex_float.c: Ditto. * testsuite/libffi.call/many_complex_longdouble.c: Ditto. * testsuite/libffi.call/return_complex1_double.c: Ditto. * testsuite/libffi.call/return_complex1_float.c: Ditto. * testsuite/libffi.call/return_complex1_longdouble.c: Ditto. * testsuite/libffi.call/return_complex2_double.c: Ditto. * testsuite/libffi.call/return_complex2_float.c: Ditto. * testsuite/libffi.call/return_complex2_longdouble.c: Ditto. * testsuite/libffi.call/return_complex_double.c: Ditto. * testsuite/libffi.call/return_complex_float.c: Ditto. * testsuite/libffi.call/return_complex_longdouble.c: Ditto. * src/raw_api.c (ffi_raw_to_ptrarray): Handle FFI_TYPE_COMPLEX (ffi_ptrarray_to_raw): Ditto. * src/prep_cif.c (ffi_prep_cif_core): Abort if FFI_TYPE_COMPLEX is not implemented in libffi for the target. * src/java_raw_api.c (ffi_java_raw_size): FFI_TYPE_COMPLEX not supported yet (abort). (ffi_java_raw_to_ptrarray): Ditto. (ffi_java_rvalue_to_raw): Ditto. (ffi_java_raw_to_rvalue): Ditto. * src/debug.c (ffi_type_test): Add debug tests for complex types. * include/ffi.h.in (FFI_TYPE_COMPLEX): Add new FFI_TYPE_COMPLEX. (FFI_TYPE_LAST): Bump. (ffi_type_complex_float): Add new ffi_type_.... (ffi_type_complex_double): Ditto. (ffi_type_complex_longdouble): Ditto. 2014-07-22 Dominik Vogt <vogt@linux.vnet.ibm.com> * src/s390/ffitarget.h (FFI_TARGET_HAS_COMPLEX_TYPE): Define to provide FFI_TYPE_COMPLEX support. * src/s390/ffi.c (ffi_check_struct_type): Implement FFI_TYPE_COMPLEX (ffi_prep_args): Ditto. (ffi_prep_cif_machdep): Ditto. (ffi_closure_helper_SYSV): Ditto.
92 lines
2.5 KiB
C
92 lines
2.5 KiB
C
/* -*-c-*- */
|
|
#include "ffitest.h"
|
|
#include <complex.h>
|
|
|
|
typedef struct cls_struct_align {
|
|
unsigned char a;
|
|
_Complex T_C_TYPE b;
|
|
unsigned char c;
|
|
} cls_struct_align;
|
|
|
|
cls_struct_align cls_struct_align_fn(
|
|
struct cls_struct_align a1, struct cls_struct_align a2)
|
|
{
|
|
struct cls_struct_align result;
|
|
|
|
result.a = a1.a + a2.a;
|
|
result.b = a1.b + a2.b;
|
|
result.c = a1.c + a2.c;
|
|
|
|
printf("%d %f,%fi %d %d %f,%fi %d: %d %f,%fi %d\n",
|
|
a1.a, T_CONV creal (a1.b), T_CONV cimag (a1.b), a1.c,
|
|
a2.a, T_CONV creal (a2.b), T_CONV cimag (a2.b), a2.c,
|
|
result.a, T_CONV creal (result.b), T_CONV cimag (result.b), result.c);
|
|
|
|
return result;
|
|
}
|
|
|
|
static void
|
|
cls_struct_align_gn(ffi_cif* cif __UNUSED__, void* resp, void** args,
|
|
void* userdata __UNUSED__)
|
|
{
|
|
|
|
struct cls_struct_align a1, a2;
|
|
|
|
a1 = *(struct cls_struct_align*)(args[0]);
|
|
a2 = *(struct cls_struct_align*)(args[1]);
|
|
|
|
*(cls_struct_align*)resp = cls_struct_align_fn(a1, a2);
|
|
}
|
|
|
|
int main (void)
|
|
{
|
|
ffi_cif cif;
|
|
void *code;
|
|
ffi_closure *pcl = ffi_closure_alloc(sizeof(ffi_closure), &code);
|
|
void* args_c[5];
|
|
ffi_type* cls_struct_fields[4];
|
|
ffi_type cls_struct_type;
|
|
ffi_type* c_arg_types[5];
|
|
|
|
struct cls_struct_align g_c = { 12, 4951 + 7 * I, 127 };
|
|
struct cls_struct_align f_c = { 1, 9320 + 1 * I, 13 };
|
|
struct cls_struct_align res_c;
|
|
|
|
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_fields[0] = &ffi_type_uchar;
|
|
cls_struct_fields[1] = &T_FFI_TYPE;
|
|
cls_struct_fields[2] = &ffi_type_uchar;
|
|
cls_struct_fields[3] = NULL;
|
|
|
|
c_arg_types[0] = &cls_struct_type;
|
|
c_arg_types[1] = &cls_struct_type;
|
|
c_arg_types[2] = NULL;
|
|
|
|
CHECK(ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 2, &cls_struct_type,
|
|
c_arg_types) == FFI_OK);
|
|
|
|
args_c[0] = &g_c;
|
|
args_c[1] = &f_c;
|
|
args_c[2] = NULL;
|
|
|
|
ffi_call(&cif, FFI_FN(cls_struct_align_fn), &res_c, args_c);
|
|
/* { dg-output "12 4951,7i 127 1 9320,1i 13: 13 14271,8i 140" } */
|
|
printf("res: %d %f,%fi %d\n",
|
|
res_c.a, T_CONV creal (res_c.b), T_CONV cimag (res_c.b), res_c.c);
|
|
/* { dg-output "\nres: 13 14271,8i 140" } */
|
|
|
|
CHECK(ffi_prep_closure_loc(pcl, &cif, cls_struct_align_gn, NULL, code) == FFI_OK);
|
|
|
|
res_c = ((cls_struct_align(*)(cls_struct_align, cls_struct_align))(code))(g_c, f_c);
|
|
/* { dg-output "\n12 4951,7i 127 1 9320,1i 13: 13 14271,8i 140" } */
|
|
printf("res: %d %f,%fi %d\n",
|
|
res_c.a, T_CONV creal (res_c.b), T_CONV cimag (res_c.b), res_c.c);
|
|
/* { dg-output "\nres: 13 14271,8i 140" } */
|
|
|
|
exit(0);
|
|
}
|