ag/cpython-source-deps
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/bivab/libffi

Browse Source 
Conflicts:
	ChangeLog
This commit is contained in:
Anthony Green
2013-11-14 10:56:29 -05:00
parent 58c2577a3f f3657da278
commit de10f5039e
3 changed files with 72 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -1,3 +1,10 @@
2013-11-14 David Schneider <david.schneider@bivab.de>
* src/arm/ffi.c: Fix register allocation for mixed float and
doubles.
* testsuite/libffi.call/cls_many_mixed_float_double.c: Testcase
for many mixed float and double arguments.
2013-11-13 Alan Modra <amodra@gmail.com> 2013-11-13 Alan Modra <amodra@gmail.com>
* doc/libffi.texi (Simple Example): Correct example code. * doc/libffi.texi (Simple Example): Correct example code.

14
src/arm/ffi.c
View File

@@ -861,7 +861,7 @@ static int vfp_type_p (ffi_type *t)
return 0; return 0;
} }
static void place_vfp_arg (ffi_cif *cif, ffi_type *t) static int place_vfp_arg (ffi_cif *cif, ffi_type *t)
{ {
int reg = cif->vfp_reg_free; int reg = cif->vfp_reg_free;
int nregs = t->size / sizeof (float); int nregs = t->size / sizeof (float);
@@ -894,9 +894,13 @@ static void place_vfp_arg (ffi_cif *cif, ffi_type *t)
reg += 1; reg += 1;
cif->vfp_reg_free = reg; cif->vfp_reg_free = reg;
} }
return; return 0;
next_reg: ; next_reg: ;
} }
// done, mark all regs as used
cif->vfp_reg_free = 16;
cif->vfp_used = 0xFFFF;
return 1;
} }
static void layout_vfp_args (ffi_cif *cif) static void layout_vfp_args (ffi_cif *cif)
@@ -911,7 +915,9 @@ static void layout_vfp_args (ffi_cif *cif)
for (i = 0; i < cif->nargs; i++) for (i = 0; i < cif->nargs; i++)
{ {
ffi_type *t = cif->arg_types[i]; ffi_type *t = cif->arg_types[i];
if (vfp_type_p (t)) if (vfp_type_p (t) && place_vfp_arg (cif, t) == 1)
place_vfp_arg (cif, t); {
break;
}
} }
} }

55
testsuite/libffi.call/cls_many_mixed_float_double.c Normal file
View File

@@ -0,0 +1,55 @@
/* Area: closure_call
Purpose: Check register allocation for closure calls with many float and double arguments
Limitations: none.
PR: none.
Originator: <david.schneider@picle.org> */
/* { dg-do run } */
#include "ffitest.h"
#include <float.h>
#include <math.h>
#define NARGS 16
static void cls_mixed_float_double_fn(ffi_cif* cif , void* ret, void** args,
void* userdata __UNUSED__)
{
double r = 0;
unsigned int i;
double t;
for(i=0; i < cif->nargs; i++)
{
if(cif->arg_types[i] == &ffi_type_double) {
t = *(((double**)(args))[i]);
} else {
t = *(((float**)(args))[i]);
}
r += t;
}
*((double*)ret) = r;
}
typedef double (*cls_mixed)(double, float, double, double, double, double, double, float, float, double, float, float);
int main (void)
{
ffi_cif cif;
ffi_closure *closure;
void* code;
ffi_type *argtypes[12] = {&ffi_type_double, &ffi_type_float, &ffi_type_double,
&ffi_type_double, &ffi_type_double, &ffi_type_double,
&ffi_type_double, &ffi_type_float, &ffi_type_float,
&ffi_type_double, &ffi_type_float, &ffi_type_float};
closure = ffi_closure_alloc(sizeof(ffi_closure), (void**)&code);
if(closure ==NULL)
abort();
CHECK(ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 12, &ffi_type_double, argtypes) == FFI_OK);
CHECK(ffi_prep_closure_loc(closure, &cif, cls_mixed_float_double_fn, NULL, code) == FFI_OK);
double ret = ((cls_mixed)code)(0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1.0, 1.1, 1.2);
ffi_closure_free(closure);
if(fabs(ret - 7.8) < FLT_EPSILON)
exit(0);
else
abort();
}