X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Flibffi.c;h=f1d72829ae5c231d7d88c628bdebf5272a0dc39a;hb=55ba09956ec121467a269a4a968da5fe45388c1e;hp=38fa09615a0b79c63a1444802d4f4ce6341c7b6a;hpb=207ff7bc85e967235f0ad1ffbf47c0f85f375063;p=m6w6%2Fext-psi

diff --git a/src/libffi.c b/src/libffi.c
index 38fa096..f1d7282 100644
--- a/src/libffi.c
+++ b/src/libffi.c
@@ -224,13 +224,13 @@ static void psi_ffi_handler(ffi_cif *_sig, void *_result, void **_args, void *_d
 
 	ffi_call(&data->signature, FFI_FN(data->impl->decl->dlptr), &ret_val, arg_prm);
 
-	psi_do_return(data->impl, &ret_val, *(zval **)_args[1]);
+	psi_do_return(*(zval **)_args[1], data->impl->stmts->ret.list[0], &ret_val);
 
 	for (i = 0; i < data->impl->stmts->set.count; ++i) {
 		set_stmt *set = data->impl->stmts->set.list[i];
 
 		if (set->arg->_zv) {
-			psi_do_set(set->arg->_zv, set->val->func, set->val->vars);
+			psi_do_set(set->arg->_zv, set->val);
 		}
 	}
 
@@ -287,10 +287,36 @@ 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, impl_val **args) {
+	ffi_cif signature;
+	ffi_type **types;
+	void **argps;
+	size_t i;
+
+	/* FIXME: cache in decl */
+
+	types = calloc(decl->args->count + 1, sizeof(*types));
+	argps = calloc(decl->args->count + 1, sizeof(*argps));
+	for (i = 0; i < decl->args->count; ++i) {
+		decl_arg *darg = decl->args->args[i];
+
+		types[i] = psi_ffi_decl_arg_type(darg);
+		argps[i] = args[i];
+	}
+
+	ffi_prep_cif(&signature, psi_ffi_abi(decl->abi->convention), decl->args->count,
+			psi_ffi_decl_arg_type(decl->func), types);
+	ffi_call(&signature, FFI_FN(decl->dlptr), ret_val, argps);
+
+	free(types);
+	free(argps);
+}
+
 static PSI_ContextOps ops = {
 	psi_ffi_init,
 	psi_ffi_dtor,
 	psi_ffi_compile,
+	psi_ffi_call,
 };
 
 PSI_ContextOps *PSI_Libffi(void)