X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Flibffi.c;h=19afda09baa803e8edef148f8742cc5265905194;hp=72ebbf095f25482577dbb2bc6618f2b0948f34d8;hb=af9a6396ef56648e10905597ec6c09f64d8ea46d;hpb=8d2ff6a3b85203ea5f8398f846a7764fd0e1d126

diff --git a/src/libffi.c b/src/libffi.c
index 72ebbf0..19afda0 100644
--- a/src/libffi.c
+++ b/src/libffi.c
@@ -78,27 +78,7 @@ static void psi_ffi_handler(ffi_cif *_sig, void *_result, void **_args, void *_d
 
 static void psi_ffi_callback(ffi_cif *_sig, void *_result, void **_args, void *_data)
 {
-	unsigned argc = _sig->nargs;
-	void **argv = _args;
-	ffi_arg *res = _result;
-	let_stmt *let;
-	decl_arg *darg = let->var->arg;
-	decl *decl_cb = darg->type->func;
-	let_callback *cb = let->val->data.callback;
-	impl_arg *iarg = cb->func->arg;
-	size_t i, argc = cb->args->count;
-	zval *argv = calloc(argc, sizeof(*argv));
-
-	// prepare args for the userland call
-	for (i = 0; i < decl_cb->args->count; ++i) {
-
-	}
-	for (i = 0; i < cb->args->count; ++i) {
-		psi_do_set(&argv[i], cb->args->vals[i]);
-	}
-	zend_fcall_info_argp(iarg->val.zend.cb->fci, argc, argv);
-	// marshal return value of the userland call
-	darg->ptr = psi_let_val(cb->func->type, iarg, darg->ptr, real_decl_type(darg->type)->strct, &darg->mem);
+	psi_callback(_data, _result, _sig->nargs, _args);
 }
 
 static inline ffi_type *psi_ffi_decl_arg_type(decl_arg *darg);
@@ -141,12 +121,14 @@ static inline PSI_LibffiCall *PSI_LibffiCallAlloc(PSI_Context *C, decl *decl) {
 	return call;
 }
 
-static inline void PSI_LibffiCallInitClosure(PSI_Context *C, PSI_LibffiCall *call, impl *impl) {
+static inline ffi_status PSI_LibffiCallInitClosure(PSI_Context *C, PSI_LibffiCall *call, impl *impl) {
 	PSI_LibffiContext *context = C->context;
-	ffi_status rc;
 
-	rc = psi_ffi_prep_closure(&call->closure, &call->code, &context->signature, psi_ffi_handler, impl);
-	ZEND_ASSERT(FFI_OK == rc);
+	return psi_ffi_prep_closure(&call->closure, &call->code, &context->signature, psi_ffi_handler, impl);
+}
+
+static inline ffi_status PSI_LibffiCallInitCallbackClosure(PSI_Context *C, PSI_LibffiCall *call, let_callback *cb) {
+	return psi_ffi_prep_closure(&call->closure, &call->code, &call->signature, psi_ffi_callback, cb);
 }
 
 static inline void PSI_LibffiCallFree(PSI_LibffiCall *call) {
@@ -288,21 +270,6 @@ static inline ffi_type *psi_ffi_decl_type(decl_type *type) {
 	decl_type *real = real_decl_type(type);
 
 	switch (real->type) {
-	case PSI_T_FUNCTION:
-		if (!real->func->call.sym) {
-			PSI_LibffiCall *call = PSI_LibffiCallAlloc(&PSI_G(context), real->func);
-			ffi_status rc;
-
-			rc = psi_ffi_prep_closure(
-					(void *) &real->func->call.closure.data,
-					&real->func->call.sym, &call->signature, psi_ffi_handler, NULL);
-			if (FFI_OK == rc) {
-				real->func->call.info = call;
-				real->func->call.closure.dtor = psi_ffi_closure_free;
-			}
-		}
-		return &ffi_type_pointer;
-
 	case PSI_T_STRUCT:
 		if (!real->strct->engine.type) {
 			ffi_type *strct = calloc(1, sizeof(ffi_type));
@@ -349,6 +316,13 @@ static inline PSI_LibffiContext *PSI_LibffiContextInit(PSI_LibffiContext *L) {
 	return L;
 }
 
+static inline void PSI_LibffiContextFree(PSI_LibffiContext **L) {
+	if (*L) {
+		free(*L);
+		*L = NULL;
+	}
+}
+
 static void psi_ffi_init(PSI_Context *C)
 {
 	C->context = PSI_LibffiContextInit(NULL);
@@ -366,13 +340,33 @@ static void psi_ffi_dtor(PSI_Context *C)
 				PSI_LibffiCallFree(decl->call.info);
 			}
 		}
+
 	}
-	free(C->context);
+	if (C->impls) {
+		size_t i, j;
+
+		for (i = 0; i < C->impls->count; ++i) {
+			impl *impl = C->impls->list[i];
+
+			for (j = 0; j < impl->stmts->let.count; ++j) {
+				let_stmt *let = impl->stmts->let.list[j];
+
+				if (let->val && let->val->kind == PSI_LET_CALLBACK) {
+					let_callback *cb = let->val->data.callback;
+
+					if (cb->decl && cb->decl->call.info) {
+						PSI_LibffiCallFree(cb->decl->call.info);
+					}
+				}
+			}
+		}
+	}
+	PSI_LibffiContextFree((void *) &C->context);
 }
 
 static zend_function_entry *psi_ffi_compile(PSI_Context *C)
 {
-	size_t i, j = 0;
+	size_t c, i, j = 0;
 	zend_function_entry *zfe;
 
 	if (!C->impls) {
@@ -389,20 +383,41 @@ static zend_function_entry *psi_ffi_compile(PSI_Context *C)
 			continue;
 		}
 
-		call = PSI_LibffiCallAlloc(C, impl->decl);
-		PSI_LibffiCallInitClosure(C, call, impl);
+		if ((call = PSI_LibffiCallAlloc(C, impl->decl))) {
+			if (FFI_OK != PSI_LibffiCallInitClosure(C, call, impl)) {
+				PSI_LibffiCallFree(call);
+				continue;
+			}
+		}
 
 		zf->fname = impl->func->name + (impl->func->name[0] == '\\');
 		zf->num_args = impl->func->args->count;
 		zf->handler = call->code;
 		zf->arg_info = psi_internal_arginfo(impl);
 		++j;
+
+		for (c = 0; c < impl->stmts->let.count; ++c) {
+			let_stmt *let = impl->stmts->let.list[c];
+
+			if (let->val && let->val->kind == PSI_LET_CALLBACK) {
+				let_callback *cb = let->val->data.callback;
+
+				if ((call = PSI_LibffiCallAlloc(C, cb->decl))) {
+					if (FFI_OK != PSI_LibffiCallInitCallbackClosure(C, call, cb)) {
+						PSI_LibffiCallFree(call);
+						continue;
+					}
+
+					cb->decl->call.sym = call->code;
+				}
+			}
+		}
 	}
 
 	for (i = 0; i < C->decls->count; ++i) {
 		decl *decl = C->decls->list[i];
 
-		if (decl->impl) {
+		if (decl->call.info) {
 			continue;
 		}