mirrors/ecl
1
Fork 0
mirror of https://gitlab.com/embeddable-common-lisp/ecl.git synced 2026-01-12 20:31:55 -08:00
Code Issues Projects Releases Packages Wiki Activity

Changed the way the callback is stored, to match the format used by callback_executor and by cmpcbk.lsp

Browse source
This commit is contained in:
Juan Jose Garcia Ripoll 2009-07-29 10:42:14 +02:00
parent 58e895e26a
commit 627acfcc02
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/c/ffi.d
View file

@ -834,7 +834,7 @@ callback_executor(ffi_cif *cif, void *result, void **args, void *userdata)
const cl_object frame = ecl_stack_frame_open(the_env, (cl_object)&frame_aux, 0);
cl_object x;
while (arg_types != Cnil) {
cl_object type = ECL_CONS_CAR(args);
cl_object type = ECL_CONS_CAR(arg_types);
enum ecl_ffi_tag tag = ecl_foreign_type_code(type);
x = ecl_foreign_data_ref_elt(*args, tag);
ecl_stack_frame_push(frame, x);
@ -858,14 +858,15 @@ callback_executor(ffi_cif *cif, void *result, void **args, void *userdata)
cl_object closure_object = ecl_make_foreign_data(@':pointer-void',
sizeof(ffi_closure),
closure);
cl_object data = cl_list(6, return_type, arg_types, cc_type,
cl_object data = cl_list(6, closure_object,
fun, return_type, arg_types, cc_type,
ecl_make_foreign_data(@':pointer-void',
sizeof(*cif), cif),
ecl_make_foreign_data(@':pointer-void',
(n + 1) * sizeof(ffi_type*),
types),
closure_object);
int status = ffi_prep_closure(closure, cif, callback_executor, data);
types));
int status = ffi_prep_closure(closure, cif, callback_executor,
ECL_CONS_CDR(data));
if (status != FFI_OK) {
FEerror("Unable to build callback. libffi returns ~D", 1,
MAKE_FIXNUM(status));