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

Support fastcall closures

Browse Source 
libffi on 32-bit x86 now supports closures for all supported ABIs.
Thus, rewrite the last remaining duplicated-by-ABI test (closure_stdcall
and closure_thiscall) to use the generic ABI_NUM/ABI_ATTR mechanism.
This commit is contained in:
Josh Triplett
2014-04-20 12:03:25 -07:00
parent 93a24f216b
commit d36952273d
5 changed files with 54 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
testsuite/libffi.call/closure_stdcall.c → testsuite/libffi.call/closure_simple.c
View File

@@ -1,15 +1,14 @@
/* Area: closure_call (stdcall convention)
Purpose: Check handling when caller expects stdcall callee
/* Area: closure_call
Purpose: Check simple closure handling with all ABIs
Limitations: none.
PR: none.
Originator: <twalljava@dev.java.net> */
/* { dg-do run { target i?86-*-* } } */
/* { dg-do run } */
#include "ffitest.h"
static void
closure_test_stdcall(ffi_cif* cif __UNUSED__, void* resp, void** args,
void* userdata)
closure_test(ffi_cif* cif __UNUSED__, void* resp, void** args, void* userdata)
{
*(ffi_arg*)resp =
(int)*(int *)args[0] + (int)(*(int *)args[1])
@@ -23,7 +22,7 @@ closure_test_stdcall(ffi_cif* cif __UNUSED__, void* resp, void** args,
}
typedef int (__STDCALL__ *closure_test_type0)(int, int, int, int);
typedef int (ABI_ATTR *closure_test_type0)(int, int, int, int);
int main (void)
{
@@ -40,10 +39,10 @@ int main (void)
cl_arg_types[4] = NULL;
/* Initialize the cif */
CHECK(ffi_prep_cif(&cif, FFI_STDCALL, 4,
CHECK(ffi_prep_cif(&cif, ABI_NUM, 4,
&ffi_type_sint, cl_arg_types) == FFI_OK);
CHECK(ffi_prep_closure_loc(pcl, &cif, closure_test_stdcall,
CHECK(ffi_prep_closure_loc(pcl, &cif, closure_test,
(void *) 3 /* userdata */, code) == FFI_OK);
res = (*(closure_test_type0)code)(0, 1, 2, 3);

56
testsuite/libffi.call/closure_thiscall.c
View File

@@ -1,56 +0,0 @@
/* Area: closure_call (thiscall convention)
Purpose: Check handling when caller expects thiscall callee
Limitations: none.
PR: none.
Originator: <ktietz@redhat.com> */
/* { dg-do run { target i?86-*-* } } */
#include "ffitest.h"
static void
closure_test_thiscall(ffi_cif* cif __UNUSED__, void* resp, void** args,
void* userdata)
{
*(ffi_arg*)resp =
(int)*(int *)args[0] + (int)(*(int *)args[1])
+ (int)(*(int *)args[2]) + (int)(*(int *)args[3])
+ (int)(intptr_t)userdata;
printf("%d %d %d %d: %d\n",
(int)*(int *)args[0], (int)(*(int *)args[1]),
(int)(*(int *)args[2]), (int)(*(int *)args[3]),
(int)*(ffi_arg *)resp);
}
typedef int (__THISCALL__ *closure_test_type0)(int, int, int, int);
int main (void)
{
ffi_cif cif;
void *code;
ffi_closure *pcl = ffi_closure_alloc(sizeof(ffi_closure), &code);
ffi_type * cl_arg_types[17];
int res;
cl_arg_types[0] = &ffi_type_uint;
cl_arg_types[1] = &ffi_type_uint;
cl_arg_types[2] = &ffi_type_uint;
cl_arg_types[3] = &ffi_type_uint;
cl_arg_types[4] = NULL;
/* Initialize the cif */
CHECK(ffi_prep_cif(&cif, FFI_THISCALL, 4,
&ffi_type_sint, cl_arg_types) == FFI_OK);
CHECK(ffi_prep_closure_loc(pcl, &cif, closure_test_thiscall,
(void *) 3 /* userdata */, code) == FFI_OK);
res = (*(closure_test_type0)code)(0, 1, 2, 3);
/* { dg-output "0 1 2 3: 9" } */
printf("res: %d\n",res);
/* { dg-output "\nres: 9" } */
exit(0);
}