X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Flibffi.c;h=257fb48521b73f965a9534410daedf595da5a1e0;hb=7d89722785c32163fe6252ed199c86ba6ee0e28c;hp=d5158271b65879a31afccd66dbbbef6f922f5730;hpb=61918592ab618c073b9846783ce79fed9f26c5f7;p=m6w6%2Fext-psi

diff --git a/src/libffi.c b/src/libffi.c
index d515827..257fb48 100644
--- a/src/libffi.c
+++ b/src/libffi.c
@@ -127,6 +127,8 @@ static inline PSI_LibffiCall *PSI_LibffiCallAlloc(PSI_Context *C, decl *decl) {
 	call->params[c] = NULL;
 
 	decl->call.info = call;
+	decl->call.rval = decl->func->ptr;
+	decl->call.argc = c;
 	decl->call.args = (void **) &call->params[c+1];
 
 	rc = ffi_prep_cif(&call->signature, psi_ffi_abi(decl->abi->convention),
@@ -152,7 +154,7 @@ static inline void PSI_LibffiCallInitClosure(PSI_Context *C, PSI_LibffiCall *cal
 			call->code);
 
 #elif PSI_HAVE_FFI_PREP_CLOSURE
-	rc = ffi_prep_closure(data->code, &context->signature, psi_ffi_handler, data);
+	rc = ffi_prep_closure(call->code, &context->signature, psi_ffi_handler, impl);
 #else
 # error "Neither ffi_prep_closure() nor ffi_prep_closure_loc() available"
 #endif
@@ -250,10 +252,10 @@ static zend_function_entry *psi_ffi_compile(PSI_Context *C)
 	return zfe;
 }
 
-static void psi_ffi_call(PSI_Context *C, impl_val *ret_val, decl *decl) {
-	PSI_LibffiCall *call = decl->call.info;
+static void psi_ffi_call(PSI_Context *C, decl_callinfo *decl_call) {
+	PSI_LibffiCall *call = decl_call->info;
 
-	ffi_call(&call->signature, FFI_FN(decl->call.sym), ret_val, decl->call.args);
+	ffi_call(&call->signature, FFI_FN(decl_call->sym), decl_call->rval, decl_call->args);
 }
 
 static PSI_ContextOps ops = {