This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Re: PATCH-3.2.2 libffi powerpc linux, backport from 3.4/3.3
Tom Tromey wrote:
"Andreas" == Andreas Tobler <toa@pop.agri.ch> writes:
Andreas> What do you mean exactly? The attached test case fails with
Andreas> the original libffi on ppclinux (for many floats) since they
Andreas> are aligned wrong.
Andreas> I do not have a real world bug myself. I could ask Kevin if
Andreas> he has?
How about adding a new test to the libffi test code?
Sorry all, now I understand you. When I created the diff I didn't
include the ffitest.diff.
Now I included it.
If you run these tests on an unmodifed powerpc-linux system they will fail.
Sorry again,
Andreas
Index: src/ffitest.c
===================================================================
RCS file: /cvs/gcc/gcc/libffi/src/ffitest.c,v
retrieving revision 1.6
diff -c -3 -p -r1.6 ffitest.c
*** src/ffitest.c 24 Feb 2002 17:31:45 -0000 1.6
--- src/ffitest.c 7 Feb 2003 18:22:04 -0000
***************
*** 1,5 ****
/* -----------------------------------------------------------------------
! ffitest.c - Copyright (c) 1996, 1997, 1998 Cygnus Solutions
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
--- 1,5 ----
/* -----------------------------------------------------------------------
! ffitest.c - Copyright (c) 1996, 1997, 1998, 2002, 2003 Red Hat, Inc.
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
*************** static test_structure_5 struct5(test_str
*** 196,209 ****
/* Take an int and a float argument, together with int userdata, and */
/* return the sum. */
! static void closure_test_fn(ffi_cif* cif,void* resp,void** args, void* userdata)
! {
! *(int*)resp =
! *(int *)args[0] + (int)(*(float *)args[1]) + (int)(long)userdata;
! }
!
! typedef int (*closure_test_type)(int, float);
!
int main(/*@unused@*/ int argc, /*@unused@*/ char *argv[])
{
ffi_cif cif;
--- 196,321 ----
/* Take an int and a float argument, together with int userdata, and */
/* return the sum. */
! #if FFI_CLOSURES
! static void
! closure_test_fn(ffi_cif* cif,void* resp,void** args, void* userdata)
! {
! *(ffi_arg*)resp =
! (int)*(unsigned long long *)args[0] + (int)(*(int *)args[1]) +
! (int)(*(unsigned long long *)args[2]) + (int)*(int *)args[3] +
! (int)(*(signed short *)args[4]) +
! (int)(*(unsigned long long *)args[5]) +
! (int)*(int *)args[6] + (int)(*(int *)args[7]) +
! (int)(*(double *)args[8]) + (int)*(int *)args[9] +
! (int)(*(int *)args[10]) + (int)(*(float *)args[11]) +
! (int)*(int *)args[12] + (int)(*(int *)args[13]) +
! (int)(*(int *)args[14]) + *(int *)args[15] + (int)(long)userdata;
!
! printf("%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d: %d\n",
! (int)*(unsigned long long *)args[0], (int)(*(int *)args[1]),
! (int)(*(unsigned long long *)args[2]),
! (int)*(int *)args[3], (int)(*(signed short *)args[4]),
! (int)(*(unsigned long long *)args[5]),
! (int)*(int *)args[6], (int)(*(int *)args[7]),
! (int)(*(double *)args[8]), (int)*(int *)args[9],
! (int)(*(int *)args[10]), (int)(*(float *)args[11]),
! (int)*(int *)args[12], (int)(*(int *)args[13]),
! (int)(*(int *)args[14]),*(int *)args[15],
! (int)(long)userdata, *(int*)resp);
! }
!
! typedef int (*closure_test_type)(unsigned long long, int, unsigned long long,
! int, signed short, unsigned long long, int,
! int, double, int, int, float, int, int,
! int, int);
!
! static void closure_test_fn1(ffi_cif* cif,void* resp,void** args,
! void* userdata)
! {
! *(ffi_arg*)resp =
! (int)*(float *)args[0] +(int)(*(float *)args[1]) +
! (int)(*(float *)args[2]) + (int)*(float *)args[3] +
! (int)(*(signed short *)args[4]) + (int)(*(float *)args[5]) +
! (int)*(float *)args[6] + (int)(*(int *)args[7]) +
! (int)(*(double*)args[8]) + (int)*(int *)args[9] +
! (int)(*(int *)args[10]) + (int)(*(float *)args[11]) +
! (int)*(int *)args[12] + (int)(*(int *)args[13]) +
! (int)(*(int *)args[14]) + *(int *)args[15] + (int)(long)userdata;
!
! printf("%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d: %d\n",
! (int)*(float *)args[0], (int)(*(float *)args[1]),
! (int)(*(float *)args[2]), (int)*(float *)args[3],
! (int)(*(signed short *)args[4]), (int)(*(float *)args[5]),
! (int)*(float *)args[6], (int)(*(int *)args[7]),
! (int)(*(double *)args[8]), (int)*(int *)args[9],
! (int)(*(int *)args[10]), (int)(*(float *)args[11]),
! (int)*(int *)args[12], (int)(*(int *)args[13]),
! (int)(*(int *)args[14]), *(int *)args[15],
! (int)(long)userdata, *(int*)resp);
! }
!
! typedef int (*closure_test_type1)(float, float, float, float, signed short,
! float, float, int, double, int, int, float,
! int, int, int, int);
!
! static void closure_test_fn2(ffi_cif* cif,void* resp,void** args,
! void* userdata)
! {
! *(ffi_arg*)resp =
! (int)*(double *)args[0] +(int)(*(double *)args[1]) +
! (int)(*(double *)args[2]) + (int)*(double *)args[3] +
! (int)(*(signed short *)args[4]) + (int)(*(double *)args[5]) +
! (int)*(double *)args[6] + (int)(*(int *)args[7]) +
! (int)(*(double *)args[8]) + (int)*(int *)args[9] +
! (int)(*(int *)args[10]) + (int)(*(float *)args[11]) +
! (int)*(int *)args[12] + (int)(*(float *)args[13]) +
! (int)(*(int *)args[14]) + *(int *)args[15] + (int)(long)userdata;
!
! printf("%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d: %d\n",
! (int)*(double *)args[0], (int)(*(double *)args[1]),
! (int)(*(double *)args[2]), (int)*(double *)args[3],
! (int)(*(signed short *)args[4]), (int)(*(double *)args[5]),
! (int)*(double *)args[6], (int)(*(int *)args[7]),
! (int)(*(double*)args[8]), (int)*(int *)args[9],
! (int)(*(int *)args[10]), (int)(*(float *)args[11]),
! (int)*(int *)args[12], (int)(*(float *)args[13]),
! (int)(*(int *)args[14]), *(int *)args[15], (int)(long)userdata,
! *(int*)resp);
! }
!
! typedef int (*closure_test_type2)(double, double, double, double, signed short,
! double, double, int, double, int, int, float,
! int, float, int, int);
!
! static void closure_test_fn3(ffi_cif* cif,void* resp,void** args,
! void* userdata)
! {
! *(ffi_arg*)resp =
! (int)*(float *)args[0] +(int)(*(float *)args[1]) +
! (int)(*(float *)args[2]) + (int)*(float *)args[3] +
! (int)(*(float *)args[4]) + (int)(*(float *)args[5]) +
! (int)*(float *)args[6] + (int)(*(float *)args[7]) +
! (int)(*(double *)args[8]) + (int)*(int *)args[9] +
! (int)(*(float *)args[10]) + (int)(*(float *)args[11]) +
! (int)*(int *)args[12] + (int)(*(float *)args[13]) +
! (int)(*(float *)args[14]) + *(int *)args[15] + (int)(long)userdata;
!
! printf("%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d: %d\n",
! (int)*(float *)args[0], (int)(*(float *)args[1]),
! (int)(*(float *)args[2]), (int)*(float *)args[3],
! (int)(*(float *)args[4]), (int)(*(float *)args[5]),
! (int)*(float *)args[6], (int)(*(float *)args[7]),
! (int)(*(double *)args[8]), (int)*(int *)args[9],
! (int)(*(float *)args[10]), (int)(*(float *)args[11]),
! (int)*(int *)args[12], (int)(*(float *)args[13]),
! (int)(*(float *)args[14]), *(int *)args[15], (int)(long)userdata,
! *(int*)resp);
! }
!
! typedef int (*closure_test_type3)(float, float, float, float, float, float,
! float, float, double, int, float, float, int,
! float, float, int);
! #endif
int main(/*@unused@*/ int argc, /*@unused@*/ char *argv[])
{
ffi_cif cif;
*************** int main(/*@unused@*/ int argc, /*@unuse
*** 225,230 ****
--- 337,350 ----
ffi_arg rint;
long long rlonglong;
+ # if FFI_CLOSURES
+ /* The closure must not be an automatic variable on
+ platforms (Solaris) that forbid stack execution by default. */
+ static ffi_closure cl;
+ #endif
+
+ ffi_type * cl_arg_types[17];
+
ffi_type ts1_type;
ffi_type ts2_type;
ffi_type ts3_type;
*************** int main(/*@unused@*/ int argc, /*@unuse
*** 704,727 ****
# if FFI_CLOSURES
/* A simple closure test */
{
! ffi_closure cl;
! ffi_type * cl_arg_types[3];
! cl_arg_types[0] = &ffi_type_sint;
cl_arg_types[1] = &ffi_type_float;
! cl_arg_types[2] = NULL;
/* Initialize the cif */
! CHECK(ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 2,
! &ffi_type_sint, cl_arg_types) == FFI_OK);
! CHECK(ffi_prep_closure(&cl, &cif, closure_test_fn,
! (void *) 3 /* userdata */)
! == FFI_OK);
! CHECK((*((closure_test_type)(&cl)))(1, 2.0) == 6);
}
- # endif
/* If we arrived here, all is good */
(void) puts("\nLooks good. No surprises.\n");
--- 824,961 ----
# if FFI_CLOSURES
/* A simple closure test */
{
! (void) puts("\nEnter FFI_CLOSURES\n");
! cl_arg_types[0] = &ffi_type_uint64;
! cl_arg_types[1] = &ffi_type_uint;
! cl_arg_types[2] = &ffi_type_uint64;
! cl_arg_types[3] = &ffi_type_uint;
! cl_arg_types[4] = &ffi_type_sshort;
! cl_arg_types[5] = &ffi_type_uint64;
! cl_arg_types[6] = &ffi_type_uint;
! cl_arg_types[7] = &ffi_type_uint;
! cl_arg_types[8] = &ffi_type_double;
! cl_arg_types[9] = &ffi_type_uint;
! cl_arg_types[10] = &ffi_type_uint;
! cl_arg_types[11] = &ffi_type_float;
! cl_arg_types[12] = &ffi_type_uint;
! cl_arg_types[13] = &ffi_type_uint;
! cl_arg_types[14] = &ffi_type_uint;
! cl_arg_types[15] = &ffi_type_uint;
! cl_arg_types[16] = NULL;
!
! /* Initialize the cif */
! CHECK(ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 16,
! &ffi_type_sint, cl_arg_types) == FFI_OK);
!
! CHECK(ffi_prep_closure(&cl, &cif, closure_test_fn,
! (void *) 3 /* userdata */) == FFI_OK);
!
! CHECK((*((closure_test_type)(&cl)))
! (1LL, 2, 3LL, 4, 127, 429LL, 7, 8, 9.5, 10, 11, 12, 13,
! 19, 21, 1) == 680);
! }
!
! {
!
! cl_arg_types[0] = &ffi_type_float;
cl_arg_types[1] = &ffi_type_float;
! cl_arg_types[2] = &ffi_type_float;
! cl_arg_types[3] = &ffi_type_float;
! cl_arg_types[4] = &ffi_type_sshort;
! cl_arg_types[5] = &ffi_type_float;
! cl_arg_types[6] = &ffi_type_float;
! cl_arg_types[7] = &ffi_type_uint;
! cl_arg_types[8] = &ffi_type_double;
! cl_arg_types[9] = &ffi_type_uint;
! cl_arg_types[10] = &ffi_type_uint;
! cl_arg_types[11] = &ffi_type_float;
! cl_arg_types[12] = &ffi_type_uint;
! cl_arg_types[13] = &ffi_type_uint;
! cl_arg_types[14] = &ffi_type_uint;
! cl_arg_types[15] = &ffi_type_uint;
! cl_arg_types[16] = NULL;
/* Initialize the cif */
! CHECK(ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 16,
! &ffi_type_sint, cl_arg_types) == FFI_OK);
! CHECK(ffi_prep_closure(&cl, &cif, closure_test_fn1,
! (void *) 3 /* userdata */) == FFI_OK);
!
! CHECK((*((closure_test_type1)(&cl)))
! (1.1, 2.2, 3.3, 4.4, 127, 5.5, 6.6, 8, 9, 10, 11, 12.0, 13,
! 19, 21, 1) == 255);
}
+ {
+
+ cl_arg_types[0] = &ffi_type_double;
+ cl_arg_types[1] = &ffi_type_double;
+ cl_arg_types[2] = &ffi_type_double;
+ cl_arg_types[3] = &ffi_type_double;
+ cl_arg_types[4] = &ffi_type_sshort;
+ cl_arg_types[5] = &ffi_type_double;
+ cl_arg_types[6] = &ffi_type_double;
+ cl_arg_types[7] = &ffi_type_uint;
+ cl_arg_types[8] = &ffi_type_double;
+ cl_arg_types[9] = &ffi_type_uint;
+ cl_arg_types[10] = &ffi_type_uint;
+ cl_arg_types[11] = &ffi_type_float;
+ cl_arg_types[12] = &ffi_type_uint;
+ cl_arg_types[13] = &ffi_type_float;
+ cl_arg_types[14] = &ffi_type_uint;
+ cl_arg_types[15] = &ffi_type_uint;
+ cl_arg_types[16] = NULL;
+
+ /* Initialize the cif */
+ CHECK(ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 16,
+ &ffi_type_sint, cl_arg_types) == FFI_OK);
+
+ CHECK(ffi_prep_closure(&cl, &cif, closure_test_fn2,
+ (void *) 3 /* userdata */) == FFI_OK);
+
+ CHECK((*((closure_test_type2)(&cl)))
+ (1, 2, 3, 4, 127, 5, 6, 8, 9, 10, 11, 12.0, 13,
+ 19.0, 21, 1) == 255);
+
+ }
+
+ {
+
+ cl_arg_types[0] = &ffi_type_float;
+ cl_arg_types[1] = &ffi_type_float;
+ cl_arg_types[2] = &ffi_type_float;
+ cl_arg_types[3] = &ffi_type_float;
+ cl_arg_types[4] = &ffi_type_float;
+ cl_arg_types[5] = &ffi_type_float;
+ cl_arg_types[6] = &ffi_type_float;
+ cl_arg_types[7] = &ffi_type_float;
+ cl_arg_types[8] = &ffi_type_double;
+ cl_arg_types[9] = &ffi_type_uint;
+ cl_arg_types[10] = &ffi_type_float;
+ cl_arg_types[11] = &ffi_type_float;
+ cl_arg_types[12] = &ffi_type_uint;
+ cl_arg_types[13] = &ffi_type_float;
+ cl_arg_types[14] = &ffi_type_float;
+ cl_arg_types[15] = &ffi_type_uint;
+ cl_arg_types[16] = NULL;
+
+ /* Initialize the cif */
+ CHECK(ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 16,
+ &ffi_type_sint, cl_arg_types) == FFI_OK);
+
+ CHECK(ffi_prep_closure(&cl, &cif, closure_test_fn3,
+ (void *) 3 /* userdata */) == FFI_OK);
+
+ CHECK((*((closure_test_type3)(&cl)))
+ (1.1, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7, 8.8, 9, 10, 11.11, 12.0, 13,
+ 19.19, 21.21, 1) == 135);
+ }
+
+ (void) puts("\nFinished FFI_CLOSURES\n");
+
+ # endif
/* If we arrived here, all is good */
(void) puts("\nLooks good. No surprises.\n");
Index: src/powerpc/ffi.c
===================================================================
RCS file: /cvs/gcc/gcc/libffi/src/powerpc/ffi.c,v
retrieving revision 1.2
diff -c -3 -p -r1.2 ffi.c
*** src/powerpc/ffi.c 24 Mar 2001 03:26:28 -0000 1.2
--- src/powerpc/ffi.c 7 Feb 2003 18:22:04 -0000
*************** void ffi_prep_args(extended_cif *ecif, u
*** 137,147 ****
switch ((*ptr)->type)
{
case FFI_TYPE_FLOAT:
! case FFI_TYPE_DOUBLE:
! if ((*ptr)->type == FFI_TYPE_FLOAT)
! double_tmp = *(float *)*p_argv;
else
! double_tmp = *(double *)*p_argv;
if (fparg_count >= NUM_FPR_ARG_REGISTERS)
{
--- 137,156 ----
switch ((*ptr)->type)
{
case FFI_TYPE_FLOAT:
! double_tmp = *(float *)*p_argv;
! if (fparg_count >= NUM_FPR_ARG_REGISTERS)
! {
! *(float *)next_arg = (float)double_tmp;
! next_arg += 1;
! }
else
! *fpr_base++ = double_tmp;
! fparg_count++;
! FFI_ASSERT(flags & FLAG_FP_ARGUMENTS);
! break;
!
! case FFI_TYPE_DOUBLE:
! double_tmp = *(double *)*p_argv;
if (fparg_count >= NUM_FPR_ARG_REGISTERS)
{
*************** ffi_status ffi_prep_cif_machdep(ffi_cif
*** 320,325 ****
--- 329,338 ----
switch ((*ptr)->type)
{
case FFI_TYPE_FLOAT:
+ fparg_count++;
+ /* floating singles are not 8-aligned on stack */
+ break;
+
case FFI_TYPE_DOUBLE:
fparg_count++;
/* If this FP arg is going on the stack, it must be
*************** ffi_closure_helper_SYSV (ffi_closure* cl
*** 612,631 ****
case FFI_TYPE_FLOAT:
/* unfortunately float values are stored as doubles
* in the ffi_closure_SYSV code (since we don't check
! * the type in that routine). This is also true
! * of floats passed on the outgoing parameter stack.
! * Also, on the outgoing stack all values are aligned
! * to 8
! *
! * Don't you just love the simplicity of this ABI!
*/
/* there are 8 64bit floating point registers */
if (nf < 8) {
! temp = *(double*)pfr;
*(float*)pfr = (float)temp;
! avalue[i] = pfr;
nf++;
pfr+=2;
} else {
--- 625,639 ----
case FFI_TYPE_FLOAT:
/* unfortunately float values are stored as doubles
* in the ffi_closure_SYSV code (since we don't check
! * the type in that routine).
*/
/* there are 8 64bit floating point registers */
if (nf < 8) {
! temp = *(double*)pfr;
*(float*)pfr = (float)temp;
! avalue[i] = pfr;
nf++;
pfr+=2;
} else {
*************** ffi_closure_helper_SYSV (ffi_closure* cl
*** 634,645 ****
* parameter stack. This is probably a really
* naughty thing to do but...
*/
- if (((long)pst) & 4) pst++;
- temp = *(double*)pst;
- *(float*)pst = (float)temp;
avalue[i] = pst;
nf++;
! pst+=2;
}
break;
--- 642,650 ----
* parameter stack. This is probably a really
* naughty thing to do but...
*/
avalue[i] = pst;
nf++;
! pst+=1;
}
break;