X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Flibffi.c;h=5dce76bb4e921932a50c539691da7ac810c599f0;hp=bb1f34f7cd536ed9d72acb5afce08144191f3569;hb=3fa287dfd76814b2ec54991c0208a019845a3dc0;hpb=7a717dad32d06fe5273ad3a9ce755908723f6685

diff --git a/src/libffi.c b/src/libffi.c
index bb1f34f..5dce76b 100644
--- a/src/libffi.c
+++ b/src/libffi.c
@@ -1,5 +1,7 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
+#else
+# include "php_config.h"
 #endif
 
 #include "php.h"
@@ -7,7 +9,7 @@
 #ifdef HAVE_LIBFFI
 
 #include "php_psi.h"
-#include "libffi.h"
+#include "engine.h"
 
 #undef PACKAGE
 #undef PACKAGE_BUGREPORT
@@ -42,8 +44,23 @@ static void *psi_ffi_closure_alloc(size_t s, void **code)
 	}
 	return *code;
 #else
-	return NULL;
+# error "Neither ffi_closure_alloc() nor mmap() available"
+#endif
+}
+
+static ffi_status psi_ffi_prep_closure(ffi_closure **closure, void **code, ffi_cif *sig, void (*handler)(ffi_cif*,void*,void**,void*), void *data) {
+	*closure = psi_ffi_closure_alloc(sizeof(ffi_closure), code);
+	ZEND_ASSERT(*closure != NULL);
+
+#if PSI_HAVE_FFI_PREP_CLOSURE_LOC
+	return ffi_prep_closure_loc(*closure, sig, handler, data, *code);
+
+#elif PSI_HAVE_FFI_PREP_CLOSURE
+	return ffi_prep_closure(*code, sig, handler, data);
+#else
+# error "Neither ffi_prep_closure() nor ffi_prep_closure_loc() is available"
 #endif
+
 }
 
 static void psi_ffi_closure_free(void *c)
@@ -55,11 +72,73 @@ static void psi_ffi_closure_free(void *c)
 #endif
 }
 
-static void psi_ffi_handler(ffi_cif *signature, void *_result, void **_args, void *_data);
+static void psi_ffi_handler(ffi_cif *_sig, void *_result, void **_args, void *_data)
+{
+	psi_call(*(zend_execute_data **)_args[0], *(zval **)_args[1], _data);
+}
+
+static void psi_ffi_callback(ffi_cif *_sig, void *_result, void **_args, void *_data)
+{
+	psi_callback(_data, _result, _sig->nargs, _args);
+}
+
+static inline ffi_type *psi_ffi_decl_arg_type(decl_arg *darg);
+
+struct psi_ffi_context {
+	ffi_cif signature;
+	ffi_type *params[2];
+};
+
+struct psi_ffi_call {
+	void *code;
+	ffi_closure *closure;
+	ffi_cif signature;
+	void *params[1]; /* [type1, type2, NULL, arg1, arg2] ... */
+};
 
 static inline ffi_abi psi_ffi_abi(const char *convention) {
 	return FFI_DEFAULT_ABI;
 }
+
+static inline struct psi_ffi_call *psi_ffi_call_alloc(struct psi_context *C, decl *decl) {
+	int rc;
+	size_t i, c = decl->args ? decl->args->count : 0;
+	struct psi_ffi_call *call = calloc(1, sizeof(*call) + 2 * c * sizeof(void *));
+
+	for (i = 0; i < c; ++i) {
+		call->params[i] = psi_ffi_decl_arg_type(decl->args->args[i]);
+	}
+	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),
+			c, psi_ffi_decl_arg_type(decl->func), (ffi_type **) call->params);
+	ZEND_ASSERT(FFI_OK == rc);
+
+	return call;
+}
+
+static inline ffi_status psi_ffi_call_init_closure(struct psi_context *C, struct psi_ffi_call *call, impl *impl) {
+	struct psi_ffi_context *context = C->context;
+
+	return psi_ffi_prep_closure(&call->closure, &call->code, &context->signature, psi_ffi_handler, impl);
+}
+
+static inline ffi_status psi_ffi_call_init_callback_closure(struct psi_context *C, struct psi_ffi_call *call, let_callback *cb) {
+	return psi_ffi_prep_closure(&call->closure, &call->code, &call->signature, psi_ffi_callback, cb);
+}
+
+static inline void psi_ffi_call_free(struct psi_ffi_call *call) {
+	if (call->closure) {
+		psi_ffi_closure_free(call->closure);
+	}
+	free(call);
+}
+
 static inline ffi_type *psi_ffi_token_type(token_t t) {
 	switch (t) {
 	default:
@@ -86,87 +165,143 @@ static inline ffi_type *psi_ffi_token_type(token_t t) {
 	case PSI_T_BOOL:
 		return &ffi_type_uchar;
 	case PSI_T_INT:
+	case PSI_T_ENUM:
 		return &ffi_type_sint;
+	case PSI_T_LONG:
+		return &ffi_type_slong;
 	case PSI_T_FLOAT:
 		return &ffi_type_float;
 	case PSI_T_DOUBLE:
 		return &ffi_type_double;
+#ifdef HAVE_LONG_DOUBLE
+	case PSI_T_LONG_DOUBLE:
+		return &ffi_type_longdouble;
+#endif
+	case PSI_T_POINTER:
+	case PSI_T_FUNCTION:
+		return &ffi_type_pointer;
 	}
 }
-static inline ffi_type *psi_ffi_decl_type(decl_type *type) {
-	return psi_ffi_token_type(real_decl_type(type)->type);
-}
-static inline ffi_type *psi_ffi_decl_arg_type(decl_arg *darg) {
-	if (darg->var->pointer_level) {
+static inline ffi_type *psi_ffi_impl_type(token_t impl_type) {
+	switch (impl_type) {
+	case PSI_T_BOOL:
+		return &ffi_type_sint8;
+	case PSI_T_INT:
+		return &ffi_type_sint64;
+	case PSI_T_STRING:
 		return &ffi_type_pointer;
-	} else {
-		return psi_ffi_decl_type(darg->type);
+	case PSI_T_FLOAT:
+	case PSI_T_DOUBLE:
+		return &ffi_type_double;
+	EMPTY_SWITCH_DEFAULT_CASE();
 	}
+	return NULL;
 }
+static void psi_ffi_struct_type_dtor(void *type) {
+	ffi_type *strct = type;
 
-typedef struct PSI_LibffiContext {
-	ffi_cif signature;
-	ffi_type *params[2];
-} PSI_LibffiContext;
+	if (strct->elements) {
+		ffi_type **ptr;
 
-typedef struct PSI_LibffiCall {
-	void *code;
-	ffi_closure *closure;
-	ffi_cif signature;
-	void *params[1]; /* [type1, type2, NULL, arg1, arg2] ... */
-} PSI_LibffiCall;
+		for (ptr = strct->elements; *ptr; ++ptr) {
+			free(*ptr);
+		}
+		free(strct->elements);
+	}
+	free(strct);
+}
 
-static inline PSI_LibffiCall *PSI_LibffiCallAlloc(PSI_Context *C, decl *decl) {
-	int rc;
-	size_t i, c = decl->args ? decl->args->count : 0;
-	PSI_LibffiCall *call = calloc(1, sizeof(*call) + 2 * c * sizeof(void *));
+static size_t psi_ffi_struct_type_pad(ffi_type **els, size_t padding) {
+	size_t i;
 
-	for (i = 0; i < c; ++i) {
-		call->params[i] = psi_ffi_decl_arg_type(decl->args->args[i]);
+	for (i = 0; i < padding; ++i) {
+		ffi_type *pad = malloc(sizeof(*pad));
+
+		memcpy(pad, &ffi_type_schar, sizeof(*pad));
+		*els++ = pad;
 	}
-	call->params[c] = NULL;
 
-	decl->call.info = call;
-	decl->call.args = (void **) &call->params[c+1];
+	return padding;
+}
 
-	rc = ffi_prep_cif(&call->signature, psi_ffi_abi(decl->abi->convention),
-			c, psi_ffi_decl_arg_type(decl->func), (ffi_type **) call->params);
-	ZEND_ASSERT(FFI_OK == rc);
+static ffi_type **psi_ffi_struct_type_elements(decl_struct *strct) {
+	size_t i, argc = strct->args->count, nels = 0, offset = 0, maxalign = 0;
+	ffi_type **els = calloc(argc + 1, sizeof(*els));
 
-	return call;
-}
+	for (i = 0; i < strct->args->count; ++i) {
+		decl_arg *darg = strct->args->args[i];
+		ffi_type *type = malloc(sizeof(*type));
+		size_t padding;
 
-static inline void PSI_LibffiCallInitClosure(PSI_Context *C, PSI_LibffiCall *call, impl *impl) {
-	PSI_LibffiContext *context = C->context;
-	int rc;
+		memcpy(type, psi_ffi_decl_arg_type(darg), sizeof(*type));
 
-	call->closure = psi_ffi_closure_alloc(sizeof(ffi_closure), &call->code);
-	ZEND_ASSERT(call->closure != NULL);
+		ZEND_ASSERT(type->size == darg->layout->len);
 
-#if PSI_HAVE_FFI_PREP_CLOSURE_LOC
-	rc = ffi_prep_closure_loc(
-			call->closure,
-			&context->signature,
-			psi_ffi_handler,
-			impl,
-			call->code);
+		if (type->alignment > maxalign) {
+			maxalign = type->alignment;
+		}
 
-#elif PSI_HAVE_FFI_PREP_CLOSURE
-	rc = ffi_prep_closure(data->code, &context->signature, psi_ffi_handler, data);
-#else
-# error "Neither ffi_prep_closure() nor ffi_prep_closure_loc() available"
-#endif
-	ZEND_ASSERT(FFI_OK == rc);
+		if ((padding = psi_offset_padding(darg->layout->pos - offset, type->alignment))) {
+			if (nels + padding + 1 > argc) {
+				argc += padding;
+				els = realloc(els, (argc + 1) * sizeof(*els));
+				els[argc] = NULL;
+			}
+			psi_ffi_struct_type_pad(&els[nels], padding);
+			nels += padding;
+			offset += padding;
+		}
+		ZEND_ASSERT(offset == darg->layout->pos);
+
+		offset = (offset + darg->layout->len + type->alignment - 1) & ~(type->alignment - 1);
+		els[nels++] = type;
+	}
+
+	/* apply struct alignment padding */
+	offset = (offset + maxalign - 1) & ~(maxalign - 1);
+
+	ZEND_ASSERT(offset <= strct->size);
+	if (offset < strct->size) {
+		psi_ffi_struct_type_pad(&els[nels], strct->size - offset);
+	}
+
+	return els;
 }
+static inline ffi_type *psi_ffi_decl_type(decl_type *type) {
+	decl_type *real = real_decl_type(type);
 
-static inline void PSI_LibffiCallFree(PSI_LibffiCall *call) {
-	if (call->closure) {
-		psi_ffi_closure_free(call->closure);
+	switch (real->type) {
+	case PSI_T_STRUCT:
+		if (!real->real.strct->engine.type) {
+			ffi_type *strct = calloc(1, sizeof(ffi_type));
+
+			strct->type = FFI_TYPE_STRUCT;
+			strct->size = 0;
+			strct->elements = psi_ffi_struct_type_elements(real->real.strct);
+
+			real->real.strct->engine.type = strct;
+			real->real.strct->engine.dtor = psi_ffi_struct_type_dtor;
+		}
+
+		return real->real.strct->engine.type;
+
+	case PSI_T_UNION:
+		return psi_ffi_decl_arg_type(real->real.unn->args->args[0]);
+
+	default:
+		return psi_ffi_token_type(real->type);
 	}
-	free(call);
 }
+static inline ffi_type *psi_ffi_decl_arg_type(decl_arg *darg) {
+	if (darg->var->pointer_level) {
+		return &ffi_type_pointer;
+	} else {
+		return psi_ffi_decl_type(darg->type);
+	}
+}
+
 
-static inline PSI_LibffiContext *PSI_LibffiContextInit(PSI_LibffiContext *L) {
+static inline struct psi_ffi_context *psi_ffi_context_init(struct psi_ffi_context *L) {
 	ffi_status rc;
 
 	if (!L) {
@@ -182,32 +317,123 @@ static inline PSI_LibffiContext *PSI_LibffiContextInit(PSI_LibffiContext *L) {
 	return L;
 }
 
-static void psi_ffi_handler(ffi_cif *_sig, void *_result, void **_args, void *_data)
-{
-	psi_call(*(zend_execute_data **)_args[0], *(zval **)_args[1], _data);
+static inline void psi_ffi_context_free(struct psi_ffi_context **L) {
+	if (*L) {
+		free(*L);
+		*L = NULL;
+	}
 }
 
-static void psi_ffi_init(PSI_Context *C)
+static void psi_ffi_init(struct psi_context *C)
 {
-	C->context = PSI_LibffiContextInit(NULL);
+	C->context = psi_ffi_context_init(NULL);
 }
 
-static void psi_ffi_dtor(PSI_Context *C) {
-	size_t i;
+static inline void psi_ffi_destroy_callbacks(struct psi_context *C, let_val *let_val) {
+	let_callback *cb;
+	let_func *fn = NULL;
 
-	for (i = 0; i < C->decls->count; ++i) {
-		decl *decl = C->decls->list[i];
+	switch (let_val->kind) {
+	case PSI_LET_CALLBACK:
+		cb = let_val->data.callback;
 
-		if (decl->call.info) {
-			PSI_LibffiCallFree(decl->call.info);
+		if (cb->decl && cb->decl->call.info) {
+			psi_ffi_call_free(cb->decl->call.info);
+		}
+		fn = cb->func;
+		/* no break */
+	case PSI_LET_FUNC:
+		if (!fn) {
+			fn = let_val->data.func;
+		}
+
+		if (fn->inner) {
+			size_t i;
+
+			for (i = 0; i < fn->inner->count; ++i) {
+				psi_ffi_destroy_callbacks(C, fn->inner->vals[i]);
+			}
 		}
+		break;
+	default:
+		break;
 	}
-	free(C->context);
 }
 
-static zend_function_entry *psi_ffi_compile(PSI_Context *C)
+static void psi_ffi_dtor(struct psi_context *C)
 {
-	size_t i, j = 0;
+	if (C->decls) {
+		size_t i;
+
+		for (i = 0; i < C->decls->count; ++i) {
+			decl *decl = C->decls->list[i];
+
+			if (decl->call.info) {
+				psi_ffi_call_free(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_ffi_call_free(cb->decl->call.info);
+					}
+				}
+			}
+		}
+	}
+	psi_ffi_context_free((void *) &C->context);
+}
+
+static inline void psi_ffi_compile_callbacks(struct psi_context *C, let_val *let_val) {
+	struct psi_ffi_call *call;
+	let_callback *cb;
+	let_func *fn = NULL;
+
+	switch (let_val->kind) {
+	case PSI_LET_CALLBACK:
+		cb = let_val->data.callback;
+		if ((call = psi_ffi_call_alloc(C, cb->decl))) {
+			if (FFI_OK != psi_ffi_call_init_callback_closure(C, call, cb)) {
+				psi_ffi_call_free(call);
+				break;
+			}
+
+			cb->decl->call.sym = call->code;
+		}
+		fn = cb->func;
+		/* no break */
+	case PSI_LET_FUNC:
+		if (!fn) {
+			fn = let_val->data.func;
+		}
+		if (fn->inner) {
+			size_t i;
+
+			for (i = 0; i < fn->inner->count; ++i) {
+				psi_ffi_compile_callbacks(C, fn->inner->vals[i]);
+			}
+		}
+		break;
+	default:
+		break;
+	}
+}
+
+static zend_function_entry *psi_ffi_compile(struct psi_context *C)
+{
+	size_t c, i, j = 0;
 	zend_function_entry *zfe;
 
 	if (!C->impls) {
@@ -217,50 +443,86 @@ static zend_function_entry *psi_ffi_compile(PSI_Context *C)
 	zfe = calloc(C->impls->count + 1, sizeof(*zfe));
 	for (i = 0; i < C->impls->count; ++i) {
 		zend_function_entry *zf = &zfe[j];
-		PSI_LibffiCall *call;
+		struct psi_ffi_call *call;
 		impl *impl = C->impls->list[i];
 
 		if (!impl->decl) {
 			continue;
 		}
 
-		call = PSI_LibffiCallAlloc(C, impl->decl);
-		PSI_LibffiCallInitClosure(C, call, impl);
+		if ((call = psi_ffi_call_alloc(C, impl->decl))) {
+			if (FFI_OK != psi_ffi_call_init_closure(C, call, impl)) {
+				psi_ffi_call_free(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) {
+			psi_ffi_compile_callbacks(C, impl->stmts->let.list[c]->val);
+		}
 	}
 
 	for (i = 0; i < C->decls->count; ++i) {
 		decl *decl = C->decls->list[i];
 
-		if (decl->impl) {
+		if (decl->call.info) {
 			continue;
 		}
 
-		PSI_LibffiCallAlloc(C, decl);
+		psi_ffi_call_alloc(C, decl);
 	}
 
 	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(struct psi_context *C, decl_callinfo *decl_call, impl_vararg *va) {
+	struct psi_ffi_call *call = decl_call->info;
+
+	if (va) {
+		ffi_status rc;
+		ffi_cif signature;
+		size_t i, nfixedargs = decl_call->argc, ntotalargs = nfixedargs + va->args->count;
+		void **params = calloc(2 * ntotalargs + 2, sizeof(void *));
 
-	ffi_call(&call->signature, FFI_FN(decl->call.sym), ret_val, decl->call.args);
+		for (i = 0; i < nfixedargs; ++i) {
+			params[i] = call->params[i];
+			params[i + ntotalargs + 1] = call->params[i + nfixedargs + 1];
+		}
+		for (i = 0; i < va->args->count; ++i) {
+			params[nfixedargs + i] = psi_ffi_impl_type(va->types[i]);
+			params[nfixedargs + i + ntotalargs + 1] = &va->values[i];
+		}
+#ifdef PSI_HAVE_FFI_PREP_CIF_VAR
+		rc = ffi_prep_cif_var(&signature, call->signature.abi,
+				nfixedargs, ntotalargs,
+				call->signature.rtype, (ffi_type **) params);
+#else
+		/* FIXME: test in config.m4; assume we can just call anyway */
+		rc = ffi_prep_cif(&signature, call->signature.abi, ntotalargs,
+				call->signature.rtype, (ffi_type **) params);
+#endif
+		ZEND_ASSERT(FFI_OK == rc);
+		ffi_call(&signature, FFI_FN(decl_call->sym), *decl_call->rval, &params[ntotalargs + 1]);
+		free(params);
+	} else {
+		ffi_call(&call->signature, FFI_FN(decl_call->sym), *decl_call->rval, decl_call->args);
+	}
 }
 
-static PSI_ContextOps ops = {
+static struct psi_context_ops ops = {
 	psi_ffi_init,
 	psi_ffi_dtor,
 	psi_ffi_compile,
 	psi_ffi_call,
 };
 
-PSI_ContextOps *PSI_Libffi(void)
+struct psi_context_ops *psi_libffi_ops(void)
 {
 	return &ops;
 }