X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Flibffi.c;h=d802bd1f293ee09aafabb82ff66a4bd4e02abcc0;hp=f1d72829ae5c231d7d88c628bdebf5272a0dc39a;hb=6a8a77b52b636041de54d1022016b4f2aa510c05;hpb=596f215b67dd267284df4fe0e11f0ca4d197bfc1

diff --git a/src/libffi.c b/src/libffi.c
index f1d7282..d802bd1 100644
--- a/src/libffi.c
+++ b/src/libffi.c
@@ -53,7 +53,7 @@ static void psi_ffi_handler(ffi_cif *signature, void *_result, void **_args, voi
 static inline ffi_abi psi_ffi_abi(const char *convention) {
 	return FFI_DEFAULT_ABI;
 }
-static inline ffi_type *psi_ffi_type(token_t t) {
+static inline ffi_type *psi_ffi_token_type(token_t t) {
 	switch (t) {
 	default:
 		ZEND_ASSERT(0);
@@ -87,7 +87,7 @@ static inline ffi_type *psi_ffi_type(token_t t) {
 	}
 }
 static inline ffi_type *psi_ffi_decl_type(decl_type *type) {
-	return psi_ffi_type(real_decl_type(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) {
@@ -100,70 +100,63 @@ static inline ffi_type *psi_ffi_decl_arg_type(decl_arg *darg) {
 typedef struct PSI_LibffiContext {
 	ffi_cif signature;
 	ffi_type *params[2];
-	struct {
-		struct PSI_LibffiData **list;
-		size_t count;
-	} data;
 } PSI_LibffiContext;
 
-typedef struct PSI_LibffiData {
-	PSI_LibffiContext *context;
-	impl *impl;
-	zend_internal_arg_info *arginfo;
+typedef struct PSI_LibffiCall {
 	void *code;
 	ffi_closure *closure;
 	ffi_cif signature;
-	ffi_type *params[1];
-} PSI_LibffiData;
+	void *params[1]; /* [type1, type2, NULL, arg1, arg2] ... */
+} PSI_LibffiCall;
 
-static inline PSI_LibffiData *PSI_LibffiDataAlloc(PSI_LibffiContext *context, impl *impl) {
-	ffi_status rc;
-	size_t i, c = impl->decl->args ? impl->decl->args->count : 0;
-	PSI_LibffiData *data = malloc(sizeof(*data) + c * sizeof(ffi_type *));
+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 *));
 
-	data->context = context;
-	data->impl = impl;
-	data->arginfo = psi_internal_arginfo(impl);
 	for (i = 0; i < c; ++i) {
-		data->params[i] = psi_ffi_decl_arg_type(impl->decl->args->args[i]);
+		call->params[i] = psi_ffi_decl_arg_type(decl->args->args[i]);
 	}
-	data->params[c] = NULL;
-
-	rc = ffi_prep_cif(
-			&data->signature,
-			psi_ffi_abi(data->impl->decl->abi->convention),
-			c,
-			psi_ffi_decl_arg_type(data->impl->decl->func),
-			data->params);
+	call->params[c] = NULL;
+
+	decl->call.info = call;
+	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);
 
-	data->closure = psi_ffi_closure_alloc(sizeof(ffi_closure), &data->code);
-	ZEND_ASSERT(data->closure != NULL);
+	return call;
+}
+
+static inline void PSI_LibffiCallInitClosure(PSI_Context *C, PSI_LibffiCall *call, impl *impl) {
+	PSI_LibffiContext *context = C->context;
+	int rc;
+
+	call->closure = psi_ffi_closure_alloc(sizeof(ffi_closure), &call->code);
+	ZEND_ASSERT(call->closure != NULL);
+
 #if PSI_HAVE_FFI_PREP_CLOSURE_LOC
 	rc = ffi_prep_closure_loc(
-			data->closure,
+			call->closure,
 			&context->signature,
 			psi_ffi_handler,
-			data,
-			data->code);
-	ZEND_ASSERT(FFI_OK == rc);
+			impl,
+			call->code);
+
 #elif PSI_HAVE_FFI_PREP_CLOSURE
 	rc = ffi_prep_closure(data->code, &context->signature, psi_ffi_handler, data);
-	ZEND_ASSERT(FFI_OK == rc);
 #else
 # error "Neither ffi_prep_closure() nor ffi_prep_closure_loc() available"
 #endif
-
-	context->data.list = realloc(context->data.list, ++context->data.count * sizeof(*context->data.list));
-	context->data.list[context->data.count-1] = data;
-
-	return data;
+	ZEND_ASSERT(FFI_OK == rc);
 }
 
-static inline void PSI_LibffiDataFree(PSI_LibffiData *data) {
-	psi_ffi_closure_free(data->closure);
-	free(data->arginfo);
-	free(data);
+static inline void PSI_LibffiCallFree(PSI_LibffiCall *call) {
+	if (call->closure) {
+		psi_ffi_closure_free(call->closure);
+	}
+	free(call);
 }
 
 static inline PSI_LibffiContext *PSI_LibffiContextInit(PSI_LibffiContext *L) {
@@ -182,69 +175,9 @@ static inline PSI_LibffiContext *PSI_LibffiContextInit(PSI_LibffiContext *L) {
 	return L;
 }
 
-static inline void PSI_LibffiContextDtor(PSI_LibffiContext *L) {
-	size_t i;
-
-	for (i = 0; i < L->data.count; ++i) {
-		PSI_LibffiDataFree(L->data.list[i]);
-	}
-	if (L->data.list) {
-		free(L->data.list);
-	}
-}
-
-static inline void PSI_LibffiContextFree(PSI_LibffiContext **L) {
-	if (*L) {
-		PSI_LibffiContextDtor(*L);
-		free(*L);
-		*L = NULL;
-	}
-}
-
 static void psi_ffi_handler(ffi_cif *_sig, void *_result, void **_args, void *_data)
 {
-	PSI_LibffiData *data = _data;
-	size_t i;
-	void **arg_prm = NULL;
-	impl_val ret_val;
-
-	if (SUCCESS != psi_parse_args(*(zend_execute_data **)_args[0], data->impl)) {
-		return;
-	}
-
-	if (data->impl->decl->args) {
-		arg_prm = malloc(data->impl->decl->args->count * sizeof(*arg_prm));
-
-		for (i = 0; i < data->impl->decl->args->count; ++i) {
-			decl_arg *darg = data->impl->decl->args->args[i];
-
-			arg_prm[i] = psi_do_let(darg);
-		}
-	}
-
-	ffi_call(&data->signature, FFI_FN(data->impl->decl->dlptr), &ret_val, arg_prm);
-
-	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);
-		}
-	}
-
-	for (i = 0; i < data->impl->stmts->fre.count; ++i) {
-		free_stmt *fre = data->impl->stmts->fre.list[i];
-
-		psi_do_free(fre);
-	}
-
-	psi_do_clean(data->impl);
-
-	if (arg_prm) {
-		free(arg_prm);
-	}
+	psi_call(*(zend_execute_data **)_args[0], *(zval **)_args[1], _data);
 }
 
 static void psi_ffi_init(PSI_Context *C)
@@ -252,16 +185,23 @@ static void psi_ffi_init(PSI_Context *C)
 	C->context = PSI_LibffiContextInit(NULL);
 }
 
-static void psi_ffi_dtor(PSI_Context *C)
-{
-	PSI_LibffiContextFree((void *) &C->context);
+static void psi_ffi_dtor(PSI_Context *C) {
+	size_t i;
+
+	for (i = 0; i < C->decls->count; ++i) {
+		decl *decl = C->decls->list[i];
+
+		if (decl->call.info) {
+			PSI_LibffiCallFree(decl->call.info);
+		}
+	}
+	free(C->context);
 }
 
 static zend_function_entry *psi_ffi_compile(PSI_Context *C)
 {
 	size_t i, j = 0;
 	zend_function_entry *zfe;
-	PSI_LibffiContext *ctx = C->context;
 
 	if (!C->impls) {
 		return NULL;
@@ -270,46 +210,40 @@ 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_LibffiData *data;
+		PSI_LibffiCall *call;
+		impl *impl = C->impls->list[i];
 
-		if (!C->impls->list[i]->decl) {
+		if (!impl->decl) {
 			continue;
 		}
 
-		data = PSI_LibffiDataAlloc(ctx, C->impls->list[i]);
-		zf->fname = C->impls->list[i]->func->name + (C->impls->list[i]->func->name[0] == '\\');
-		zf->num_args = C->impls->list[i]->func->args->count;
-		zf->handler = data->code;
-		zf->arg_info = data->arginfo;
+		call = PSI_LibffiCallAlloc(C, impl->decl);
+		PSI_LibffiCallInitClosure(C, call, impl);
+
+		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;
 	}
 
-	return zfe;
-}
+	for (i = 0; i < C->decls->count; ++i) {
+		decl *decl = C->decls->list[i];
 
-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];
+		if (decl->impl) {
+			continue;
+		}
 
-		types[i] = psi_ffi_decl_arg_type(darg);
-		argps[i] = args[i];
+		PSI_LibffiCallAlloc(C, decl);
 	}
 
-	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);
+	return zfe;
+}
+
+static void psi_ffi_call(PSI_Context *C, impl_val *ret_val, decl *decl) {
+	PSI_LibffiCall *call = decl->call.info;
 
-	free(types);
-	free(argps);
+	ffi_call(&call->signature, FFI_FN(decl->call.sym), ret_val, decl->call.args);
 }
 
 static PSI_ContextOps ops = {