X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Flibffi.c;h=514394f4047f506650473e367a724a7c729d4d8b;hp=13eab49d5ecbd958b804cac32525a05c8c968de9;hb=70f215a31fab4be1fe3e80125eb401e11eb02b9f;hpb=c5f1eb3b7e969dde73a6e485a19d5a2766651970

diff --git a/src/libffi.c b/src/libffi.c
index 13eab49..514394f 100644
--- a/src/libffi.c
+++ b/src/libffi.c
@@ -78,20 +78,50 @@ 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)
 {
+	size_t i;
 	unsigned argc = _sig->nargs;
 	void **argv = _args;
-	ffi_arg *res = _result;
-	decl *decl = _data;
-	size_t i;
+	let_callback *cb = _data;
+	decl *decl_cb = cb->decl;
+	impl_arg *iarg = cb->func->var->arg;
+	zval return_value, *zargv = calloc(argc, sizeof(*zargv));
+	void *result, *to_free = NULL;
+
+	ZEND_ASSERT(argc == cb->decl->args->count);
+
+	/* prepare args for the userland call */
+	for (i = 0; i < argc; ++i) {
+		cb->decl->args->args[i]->ptr = argv[i];
+	}
+	for (i = 0; i < cb->args->count; ++i) {
+		psi_do_set(&zargv[i], cb->args->vals[i]);
+	}
+	zend_fcall_info_argp(&iarg->val.zend.cb->fci, cb->args->count, zargv);
 
-	// prepare args for the userland call
-	for (i = 0; i < decl->args->count; ++i) {
+	/* callback into userland */
+	ZVAL_UNDEF(&return_value);
+	iarg->_zv = &return_value;
+	zend_fcall_info_call(&iarg->val.zend.cb->fci, &iarg->val.zend.cb->fcc, iarg->_zv, NULL);
+
+	/* marshal return value of the userland call */
+	switch (iarg->type->type) {
+	case PSI_T_BOOL:	zend_parse_arg_bool(iarg->_zv, &iarg->val.zend.bval, NULL, 0);		break;
+	case PSI_T_LONG:	zend_parse_arg_long(iarg->_zv, &iarg->val.zend.lval, NULL, 0, 1);	break;
+	case PSI_T_FLOAT:
+	case PSI_T_DOUBLE:	zend_parse_arg_double(iarg->_zv, &iarg->val.dval, NULL, 0);			break;
+	case PSI_T_STRING:	zend_parse_arg_str(iarg->_zv, &iarg->val.zend.str, 0);				break;
+	}
+	result = cb->func->handler(_result, decl_cb->func->type, iarg, &to_free);
 
+	if (result != _result) {
+		*(void **)_result = result;
 	}
-	// marshal return value of the userland call
-	switch (decl->func->type->type) {
 
+	zend_fcall_info_args_clear(&iarg->val.zend.cb->fci, 0);
+	for (i = 0; i < cb->args->count; ++i) {
+		zval_ptr_dtor(&zargv[i]);
 	}
+	free(zargv);
 }
 
 static inline ffi_type *psi_ffi_decl_arg_type(decl_arg *darg);
@@ -134,12 +164,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) {
@@ -282,17 +314,6 @@ static inline ffi_type *psi_ffi_decl_type(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(&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:
@@ -358,13 +379,33 @@ static void psi_ffi_dtor(PSI_Context *C)
 				PSI_LibffiCallFree(decl->call.info);
 			}
 		}
+
+	}
+	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);
+					}
+				}
+			}
+		}
 	}
 	free(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) {
@@ -382,19 +423,41 @@ static zend_function_entry *psi_ffi_compile(PSI_Context *C)
 		}
 
 		call = PSI_LibffiCallAlloc(C, impl->decl);
-		PSI_LibffiCallInitClosure(C, call, impl);
+		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->kind == PSI_LET_CALLBACK) {
+				let_callback *cb = let->val->data.callback;
+
+				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->impl) {
+//			continue;
+//		}
+		if (decl->call.info) {
 			continue;
 		}