X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Flibffi.c;h=e30966aeb3a4e635eb6fedb3a314a328338cbc17;hp=be9edfd26ec1cb4a5df3a7210fc3a5b94f482907;hb=b029005e56a8913fbb3d17ab497b4a37a00a211c;hpb=b6a04e85779e14399f03e91939b8cb47eb330ef7

diff --git a/src/libffi.c b/src/libffi.c
index be9edfd..e30966a 100644
--- a/src/libffi.c
+++ b/src/libffi.c
@@ -1,15 +1,35 @@
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
+/*******************************************************************************
+ Copyright (c) 2016, Michael Wallner <mike@php.net>.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+     * Redistributions of source code must retain the above copyright notice,
+       this list of conditions and the following disclaimer.
+     * Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*******************************************************************************/
+
+#include "php_psi_stdinc.h"
+#include "context.h"
+#include "call.h"
 #include "php.h"
 
 #ifdef HAVE_LIBFFI
 
-#include "php_psi.h"
-#include "libffi.h"
-#include "engine.h"
-
 #undef PACKAGE
 #undef PACKAGE_BUGREPORT
 #undef PACKAGE_NAME
@@ -43,7 +63,21 @@ 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);
+	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
 }
 
@@ -56,16 +90,32 @@ static void psi_ffi_closure_free(void *c)
 #endif
 }
 
-static void psi_ffi_handler(ffi_cif *signature, void *_result, void **_args, void *_data);
-static inline ffi_type *psi_ffi_decl_arg_type(decl_arg *darg);
+static void psi_ffi_prep_va(ffi_cif *base, ffi_cif *signature, size_t argc, size_t va_count,
+		ffi_type **param_types) {
+	ffi_status rc;
 
-static inline ffi_abi psi_ffi_abi(const char *convention) {
-	return FFI_DEFAULT_ABI;
+#ifdef PSI_HAVE_FFI_PREP_CIF_VAR
+	rc = ffi_prep_cif_var(signature, base->abi, argc, argc + va_count,
+			base->rtype, param_types);
+#else
+	/* FIXME: test in config.m4; assume we can just call anyway */
+	rc = ffi_prep_cif(signature, base->abi, argc + va_count, base->rtype, param_types);
+#endif
+
+	assert(FFI_OK == rc);
 }
+
+#if HAVE_INT128
+static ffi_type *ffi_type_sint128;
+static ffi_type *ffi_type_uint128;
+#endif
+
+static inline ffi_type *psi_ffi_decl_arg_type(struct psi_decl_arg *darg);
+
 static inline ffi_type *psi_ffi_token_type(token_t t) {
 	switch (t) {
 	default:
-		ZEND_ASSERT(0);
+		assert(0);
 		/* no break */
 	case PSI_T_VOID:
 		return &ffi_type_void;
@@ -85,13 +135,16 @@ static inline ffi_type *psi_ffi_token_type(token_t t) {
 		return &ffi_type_sint64;
 	case PSI_T_UINT64:
 		return &ffi_type_uint64;
+#if HAVE_INT128
+	case PSI_T_INT128:
+		return ffi_type_sint128;
+	case PSI_T_UINT128:
+		return ffi_type_uint128;
+#endif
 	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:
@@ -147,34 +200,49 @@ static size_t psi_ffi_struct_type_pad(ffi_type **els, size_t padding) {
 	return padding;
 }
 
-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));
+static ffi_type **psi_ffi_struct_type_elements(struct psi_decl_struct *strct) {
+	size_t i = 0, argc, nels = 0, offset = 0, maxalign = 0, last_arg_pos = -1;
+	ffi_type **tmp, **els;
+	struct psi_decl_arg *darg;
+
+	argc = psi_plist_count(strct->args);
+	els = calloc(argc + 1, sizeof(*els));
 
-	for (i = 0; i < strct->args->count; ++i) {
-		decl_arg *darg = strct->args->args[i];
-		ffi_type *type = malloc(sizeof(*type));
+	while (psi_plist_get(strct->args, i++, &darg)) {
+		ffi_type *type;
 		size_t padding;
 
-		memcpy(type, psi_ffi_decl_arg_type(darg), sizeof(*type));
+		if (darg->layout->pos == last_arg_pos) {
+			/* skip bit fields */
+			continue;
+		}
+		last_arg_pos = darg->layout->pos;
 
-		ZEND_ASSERT(type->size == darg->layout->len);
+		type = malloc(sizeof(*type));
+		*type = *psi_ffi_decl_arg_type(darg);
 
 		if (type->alignment > maxalign) {
 			maxalign = type->alignment;
 		}
 
+		assert(type->size <= darg->layout->len);
 		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));
+				tmp = realloc(els, (argc + 1) * sizeof(*els));
+				if (tmp) {
+					els = tmp;
+				} else {
+					free(els);
+					return NULL;
+				}
 				els[argc] = NULL;
 			}
 			psi_ffi_struct_type_pad(&els[nels], padding);
 			nels += padding;
 			offset += padding;
 		}
-		ZEND_ASSERT(offset == darg->layout->pos);
+		assert(offset == darg->layout->pos);
 
 		offset = (offset + darg->layout->len + type->alignment - 1) & ~(type->alignment - 1);
 		els[nels++] = type;
@@ -183,39 +251,53 @@ static ffi_type **psi_ffi_struct_type_elements(decl_struct *strct) {
 	/* apply struct alignment padding */
 	offset = (offset + maxalign - 1) & ~(maxalign - 1);
 
-	ZEND_ASSERT(offset <= strct->size);
+	assert(offset <= strct->size);
 	if (offset < strct->size) {
-		psi_ffi_struct_type_pad(&els[nels], strct->size - offset);
+		size_t padding = strct->size - offset;
+
+		tmp = realloc(els, (padding + argc + 1) * sizeof(*els));
+		if (tmp) {
+			els = tmp;
+		} else {
+			free(els);
+			return NULL;
+		}
+		psi_ffi_struct_type_pad(&els[nels], padding);
+		els[argc + padding] = NULL;
 	}
 
 	return els;
 }
-static inline ffi_type *psi_ffi_decl_type(decl_type *type) {
-	decl_type *real = real_decl_type(type);
+static inline ffi_type *psi_ffi_decl_type(struct psi_decl_type *type) {
+	struct psi_decl_type *real = psi_decl_type_get_real(type);
 
 	switch (real->type) {
 	case PSI_T_STRUCT:
-		if (!real->strct->engine.type) {
+		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->strct);
+			strct->elements = psi_ffi_struct_type_elements(real->real.strct);
 
-			real->strct->engine.type = strct;
-			real->strct->engine.dtor = psi_ffi_struct_type_dtor;
+			real->real.strct->engine.type = strct;
+			real->real.strct->engine.dtor = psi_ffi_struct_type_dtor;
 		}
 
-		return real->strct->engine.type;
+		return real->real.strct->engine.type;
 
 	case PSI_T_UNION:
-		return psi_ffi_decl_arg_type(real->unn->args->args[0]);
+		{
+			struct psi_decl_arg *arg;
+			psi_plist_get(real->real.unn->args, 0, &arg);
+			return psi_ffi_decl_arg_type(arg);
+		}
 
 	default:
 		return psi_ffi_token_type(real->type);
 	}
 }
-static inline ffi_type *psi_ffi_decl_arg_type(decl_arg *darg) {
+static inline ffi_type *psi_ffi_decl_arg_type(struct psi_decl_arg *darg) {
 	if (darg->var->pointer_level) {
 		return &ffi_type_pointer;
 	} else {
@@ -223,71 +305,307 @@ static inline ffi_type *psi_ffi_decl_arg_type(decl_arg *darg) {
 	}
 }
 
-typedef struct PSI_LibffiContext {
+static inline ffi_abi psi_ffi_abi(const char *convention) {
+	if (FFI_LAST_ABI - 2 != FFI_FIRST_ABI) {
+#ifdef HAVE_FFI_STDCALL
+		if (!strcasecmp(convention, "stdcall")) {
+			return FFI_STDCALL;
+		}
+#endif
+#ifdef HAVE_FFI_FASTCALL
+		if (!strcasecmp(convention, "fastcall")) {
+			return FFI_FASTCALL;
+		}
+#endif
+	}
+	return FFI_DEFAULT_ABI;
+}
+
+struct psi_ffi_context {
 	ffi_cif signature;
 	ffi_type *params[2];
-} PSI_LibffiContext;
+};
+
+struct psi_ffi_impl_info {
+	struct psi_context *context;
+	struct psi_call_frame *frame;
+
+	void *code;
+	ffi_closure *closure;
+};
+
+struct psi_ffi_callback_info {
+	struct psi_ffi_impl_info *impl_info;
+	struct psi_let_exp *let_exp;
 
-typedef struct PSI_LibffiCall {
 	void *code;
 	ffi_closure *closure;
+};
+
+struct psi_ffi_decl_info {
 	ffi_cif signature;
-	void *params[1]; /* [type1, type2, NULL, arg1, arg2] ... */
-} PSI_LibffiCall;
+	ffi_type *params[1];
+};
+
+static inline struct psi_ffi_decl_info *psi_ffi_decl_init(struct psi_decl *decl) {
+	if (!decl->info) {
+		int rc;
+		size_t i, c = psi_plist_count(decl->args);
+		struct psi_decl_arg *arg;
+		struct psi_ffi_decl_info *info = calloc(1, sizeof(*info) + 2 * c * sizeof(void *));
+
+		for (i = 0; psi_plist_get(decl->args, i, &arg); ++i) {
+			info->params[i] = psi_ffi_decl_arg_type(arg);
+		}
+		info->params[c] = NULL;
 
-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 *));
+		rc = ffi_prep_cif(&info->signature, psi_ffi_abi(decl->abi->convention),
+				c, psi_ffi_decl_arg_type(decl->func), info->params);
 
-	for (i = 0; i < c; ++i) {
-		call->params[i] = psi_ffi_decl_arg_type(decl->args->args[i]);
+		if (FFI_OK != rc) {
+			free(info);
+		} else {
+			decl->info = info;
+		}
 	}
-	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];
+	return decl->info;
+}
+
+static inline void psi_ffi_decl_dtor(struct psi_decl *decl) {
+	if (decl->info) {
+		free(decl->info);
+		decl->info = NULL;
+	}
+}
 
-	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 void psi_ffi_handler(ffi_cif *sig, void *result, void **args, void *data)
+{
+	struct psi_impl *impl = data;
+	struct psi_ffi_impl_info *info = impl->info;
 
-	return call;
+	psi_context_call(info->context, *(zend_execute_data **)args[0], *(zval **)args[1], impl);
 }
 
-static inline void PSI_LibffiCallInitClosure(PSI_Context *C, PSI_LibffiCall *call, impl *impl) {
-	PSI_LibffiContext *context = C->context;
-	int rc;
+static void psi_ffi_callback(ffi_cif *sig, void *result, void **args, void *data)
+{
+	struct psi_ffi_callback_info *cb_info = data;
+	struct psi_call_frame_callback cb_data;
 
-	call->closure = psi_ffi_closure_alloc(sizeof(ffi_closure), &call->code);
-	ZEND_ASSERT(call->closure != NULL);
+	assert(cb_info->impl_info->frame);
 
-#if PSI_HAVE_FFI_PREP_CLOSURE_LOC
-	rc = ffi_prep_closure_loc(
-			call->closure,
-			&context->signature,
-			psi_ffi_handler,
-			impl,
-			call->code);
+	cb_data.cb = cb_info->let_exp;
+	cb_data.argc = sig->nargs;
+	cb_data.argv = args;
+	cb_data.rval = result;
 
-#elif PSI_HAVE_FFI_PREP_CLOSURE
-	rc = ffi_prep_closure(call->code, &context->signature, psi_ffi_handler, impl);
-#else
-# error "Neither ffi_prep_closure() nor ffi_prep_closure_loc() available"
-#endif
-	ZEND_ASSERT(FFI_OK == rc);
+	psi_call_frame_do_callback(cb_info->impl_info->frame, &cb_data);
+}
+
+static inline void psi_ffi_callback_init(struct psi_ffi_impl_info *impl_info,
+		struct psi_let_exp *let_exp) {
+	struct psi_ffi_callback_info *cb_info;
+	struct psi_ffi_decl_info *decl_info;
+	struct psi_let_callback *cb;
+	struct psi_let_func *fn = NULL;
+	ffi_status rc;
+
+	switch (let_exp->kind) {
+	case PSI_LET_CALLBACK:
+		cb = let_exp->data.callback;
+		if (cb->decl->info) {
+			decl_info = cb->decl->info;
+		} else {
+			decl_info = psi_ffi_decl_init(cb->decl);
+		}
+
+		cb_info = calloc(1, sizeof(*cb_info));
+		cb_info->impl_info = impl_info;
+		cb_info->let_exp = let_exp;
+		rc = psi_ffi_prep_closure(&cb_info->closure, &cb_info->code,
+				&decl_info->signature, psi_ffi_callback, cb_info);
+
+		if (FFI_OK != rc) {
+			free(cb_info);
+			break;
+		}
+		cb->info = cb_info;
+
+		assert(!cb->decl->sym);
+		cb->decl->sym = cb_info->code;
+		fn = cb->func;
+		/* no break */
+
+	case PSI_LET_FUNC:
+		if (!fn) {
+			fn = let_exp->data.func;
+		}
+		if (fn->inner) {
+			size_t i = 0;
+			struct psi_let_exp *inner_let;
+
+			while (psi_plist_get(fn->inner, i++, &inner_let)) {
+				psi_ffi_callback_init(impl_info, inner_let);
+			}
+		}
+		break;
+	default:
+		break;
+	}
+}
+
+static inline void psi_ffi_callback_dtor(struct psi_let_exp *let_exp) {
+	struct psi_let_callback *cb;
+	struct psi_let_func *fn = NULL;
+
+	switch (let_exp->kind) {
+	case PSI_LET_CALLBACK:
+		cb = let_exp->data.callback;
+
+		psi_ffi_decl_dtor(cb->decl);
+
+		if (cb->info) {
+			struct psi_ffi_callback_info *info = cb->info;
+
+			if (info->closure) {
+				psi_ffi_closure_free(info->closure);
+			}
+			free(info);
+			cb->info = NULL;
+		}
+		fn = cb->func;
+		/* no break */
+	case PSI_LET_FUNC:
+		if (!fn) {
+			fn = let_exp->data.func;
+		}
+
+		if (fn->inner) {
+			size_t i = 0;
+			struct psi_let_exp *cb;
+
+			while (psi_plist_get(fn->inner, i++, &cb)) {
+				psi_ffi_callback_dtor(cb);
+			}
+		}
+		break;
+	default:
+		break;
+	}
+}
+
+static inline struct psi_ffi_impl_info *psi_ffi_impl_init(struct psi_impl *impl,
+		struct psi_context *C) {
+	struct psi_ffi_context *context = C->context;
+	struct psi_ffi_impl_info *info = calloc(1, sizeof(*info));
+	struct psi_let_stmt *let;
+	ffi_status rc;
+	size_t l = 0;
+
+	info->context = C;
+
+	rc = psi_ffi_prep_closure(&info->closure, &info->code,
+			&context->signature, psi_ffi_handler, impl);
+
+	if (FFI_OK != rc) {
+		free(info);
+		return NULL;
+	}
+
+	while (psi_plist_get(impl->stmts.let, l++, &let)) {
+		psi_ffi_callback_init(info, let->exp);
+	}
+
+	return impl->info = info;
+}
+
+static inline void psi_ffi_impl_dtor(struct psi_impl *impl) {
+	struct psi_ffi_impl_info *info = impl->info;
+	struct psi_let_stmt *let;
+	size_t j = 0;
+
+	while (psi_plist_get(impl->stmts.let, j++, &let)) {
+		psi_ffi_callback_dtor(let->exp);
+	}
+
+	if (info) {
+		if (info->closure) {
+			psi_ffi_closure_free(info->closure);
+		}
+		free(info);
+		impl->info = NULL;
+	}
+}
+
+static void psi_ffi_extvar_get(ffi_cif *sig, void *result, void **args, void *data) {
+	struct psi_decl_extvar *evar = data;
+
+	psi_decl_extvar_get(evar, result);
+}
+
+static void psi_ffi_extvar_set(ffi_cif *sig, void *result, void **args, void *data) {
+	struct psi_decl_extvar *evar = data;
+
+	psi_decl_extvar_set(evar, args[0]);
 }
 
-static inline void PSI_LibffiCallFree(PSI_LibffiCall *call) {
-	if (call->closure) {
-		psi_ffi_closure_free(call->closure);
+struct psi_ffi_extvar_info {
+	struct {
+		ffi_cif signature;
+		void *code;
+		ffi_closure *closure;
+	} get;
+	struct {
+		ffi_cif signature;
+		ffi_type *params[1];
+		void *code;
+		ffi_closure *closure;
+	} set;
+};
+
+static inline ffi_status psi_ffi_extvar_init(struct psi_decl_extvar *evar,
+		ffi_type *type) {
+	struct psi_ffi_extvar_info *info = calloc(1, sizeof(*info));
+	ffi_status rc;
+
+	rc = ffi_prep_cif(&info->get.signature, FFI_DEFAULT_ABI, 0,
+			type, NULL);
+	if (FFI_OK != rc) {
+		return rc;
+	}
+	rc = psi_ffi_prep_closure(&info->get.closure, &info->get.code,
+			&info->get.signature, psi_ffi_extvar_get, evar);
+	if (FFI_OK != rc) {
+		return rc;
 	}
-	free(call);
+
+	info->set.params[0] = type;
+	rc = ffi_prep_cif(&info->set.signature, FFI_DEFAULT_ABI, 1,
+			&ffi_type_void, info->set.params);
+	if (FFI_OK != rc) {
+		return rc;
+	}
+	rc = psi_ffi_prep_closure(&info->set.closure, &info->set.code,
+			&info->set.signature, psi_ffi_extvar_set, evar);
+	if (FFI_OK != rc) {
+		return rc;
+	}
+
+	evar->info = info;
+	evar->getter->sym = info->get.code;
+	evar->setter->sym = info->set.code;
+
+	return FFI_OK;
 }
 
-static inline PSI_LibffiContext *PSI_LibffiContextInit(PSI_LibffiContext *L) {
+static inline void psi_ffi_extvar_dtor(struct psi_decl_extvar *evar) {
+	if (evar->info) {
+		free(evar->info);
+		evar->info = NULL;
+	}
+}
+
+static inline struct psi_ffi_context *psi_ffi_context_init(struct psi_ffi_context *L) {
 	ffi_status rc;
 
 	if (!L) {
@@ -298,121 +616,226 @@ static inline PSI_LibffiContext *PSI_LibffiContextInit(PSI_LibffiContext *L) {
 	L->params[0] = &ffi_type_pointer;
 	L->params[1] = &ffi_type_pointer;
 	rc = ffi_prep_cif(&L->signature, FFI_DEFAULT_ABI, 2, &ffi_type_void, L->params);
-	ZEND_ASSERT(rc == FFI_OK);
+	assert(rc == FFI_OK);
 
 	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)
+static void psi_ffi_dtor(struct psi_context *C)
 {
 	if (C->decls) {
-		size_t i;
+		size_t i = 0;
+		struct psi_decl *decl;
+
+		while (psi_plist_get(C->decls, i++, &decl)) {
+			psi_ffi_decl_dtor(decl);
+		}
 
-		for (i = 0; i < C->decls->count; ++i) {
-			decl *decl = C->decls->list[i];
+	}
+	if (C->vars) {
+		size_t i = 0;
+		struct psi_decl_extvar *evar;
 
-			if (decl->call.info) {
-				PSI_LibffiCallFree(decl->call.info);
-			}
+		while (psi_plist_get(C->vars, i++, &evar)) {
+			psi_ffi_extvar_dtor(evar);
+		}
+	}
+	if (C->impls) {
+		size_t i = 0;
+		struct psi_impl *impl;
+
+		while (psi_plist_get(C->impls, i++, &impl)) {
+			psi_ffi_impl_dtor(impl);
 		}
 	}
-	free(C->context);
+	psi_ffi_context_free((void *) &C->context);
 }
 
-static zend_function_entry *psi_ffi_compile(PSI_Context *C)
+
+static zend_function_entry *psi_ffi_compile(struct psi_context *C)
 {
-	size_t i, j = 0;
-	zend_function_entry *zfe;
+	size_t i = 0, d = 0, v = 0, nf = 0;
+	struct psi_impl *impl;
+	struct psi_decl *decl;
+	struct psi_decl_extvar *evar;
+	zend_function_entry *zfe = NULL;
 
-	if (!C->impls) {
-		return NULL;
+	while (psi_plist_get(C->vars, v++, &evar)) {
+		ffi_type *type = psi_ffi_decl_arg_type(evar->arg);
+
+		if (FFI_OK == psi_ffi_extvar_init(evar, type)) {
+			/* */
+		}
 	}
 
-	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;
-		impl *impl = C->impls->list[i];
+	if (C->impls) {
+		zfe = calloc(psi_plist_count(C->impls) + 1, sizeof(*zfe));
 
-		if (!impl->decl) {
-			continue;
-		}
+		while (psi_plist_get(C->impls, i++, &impl)) {
+			zend_function_entry *zf = &zfe[nf];
 
-		call = PSI_LibffiCallAlloc(C, impl->decl);
-		PSI_LibffiCallInitClosure(C, call, impl);
+			if (!impl->decl) {
+				continue;
+			}
+			if (!psi_ffi_decl_init(impl->decl)) {
+				continue;
+			}
+			if (!psi_ffi_impl_init(impl, C)) {
+				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;
+			zf->fname = impl->func->name + (impl->func->name[0] == '\\');
+			zf->handler = ((struct psi_ffi_impl_info *) impl->info)->code;
+			zf->num_args = psi_plist_count(impl->func->args);
+			zf->arg_info = psi_internal_arginfo(impl);
+			++nf;
+		}
 	}
 
-	for (i = 0; i < C->decls->count; ++i) {
-		decl *decl = C->decls->list[i];
-
-		if (decl->impl) {
+	while (psi_plist_get(C->decls, d++, &decl)) {
+		if (decl->info) {
 			continue;
 		}
 
-		PSI_LibffiCallAlloc(C, decl);
+		psi_ffi_decl_init(decl);
 	}
 
 	return zfe;
 }
 
-static void psi_ffi_call(PSI_Context *C, decl_callinfo *decl_call, impl_vararg *va) {
-	PSI_LibffiCall *call = decl_call->info;
+static inline void psi_ffi_call_ex(struct psi_call_frame *frame) {
+	struct psi_decl *decl = psi_call_frame_get_decl(frame);
+	struct psi_impl *impl = psi_call_frame_get_impl(frame);
+	struct psi_ffi_decl_info *decl_info = decl->info;
+	struct psi_ffi_impl_info *impl_info;
+	struct psi_call_frame *prev;
+
+	if (impl) {
+		impl_info = impl->info;
+		prev = impl_info->frame;
+		impl_info->frame = frame;
+	}
+	ffi_call(&decl_info->signature, FFI_FN(decl->sym),
+			psi_call_frame_get_rpointer(frame),
+			psi_call_frame_get_arg_pointers(frame));
+	if (impl) {
+		impl_info->frame = prev;
+	}
+}
 
-	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 *));
+static inline void psi_ffi_call_va(struct psi_call_frame *frame) {
+	ffi_cif signature;
+	struct psi_call_frame *prev;
+	struct psi_decl *decl = psi_call_frame_get_decl(frame);
+	struct psi_impl *impl = psi_call_frame_get_impl(frame);
+	struct psi_ffi_decl_info *decl_info = decl->info;
+	struct psi_ffi_impl_info *impl_info;
+	size_t i, va_count, argc;
+	ffi_type **param_types;
+
+	argc = psi_plist_count(decl->args);
+	va_count = psi_call_frame_num_var_args(frame);
+	param_types = ecalloc(argc + va_count + 1, sizeof(ffi_type *));
+	memcpy(param_types, decl_info->params, argc * sizeof(ffi_type *));
+	for (i = 0; i < va_count; ++i) {
+		struct psi_call_frame_argument *frame_arg;
+
+		frame_arg = psi_call_frame_get_var_argument(frame, i);
+		param_types[argc + i] = psi_ffi_impl_type(frame_arg->va_type);
+	}
 
-		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);
+	psi_ffi_prep_va(&decl_info->signature, &signature, argc, va_count, param_types);
+
+	if (impl) {
+		impl_info = impl->info;
+		prev = impl_info->frame;
+		impl_info->frame = frame;
+	}
+	ffi_call(&signature, FFI_FN(decl->sym),
+			psi_call_frame_get_rpointer(frame),
+			psi_call_frame_get_arg_pointers(frame));
+	if (impl) {
+		impl_info->frame = prev;
+	}
+
+	efree(param_types);
+}
+
+static void psi_ffi_call(struct psi_call_frame *frame) {
+	if (psi_call_frame_num_var_args(frame)) {
+		psi_ffi_call_va(frame);
 	} else {
-		ffi_call(&call->signature, FFI_FN(decl_call->sym), *decl_call->rval, decl_call->args);
+		psi_ffi_call_ex(frame);
 	}
 }
 
-static PSI_ContextOps ops = {
+static void *psi_ffi_query(struct psi_context *C, enum psi_context_query q, void *arg) {
+	switch (q) {
+	case PSI_CONTEXT_QUERY_SELF:
+		return "ffi";
+	case PSI_CONTEXT_QUERY_TYPE:
+		return psi_ffi_impl_type(*(token_t *) arg);
+	}
+	return NULL;
+}
+
+static ZEND_RESULT_CODE psi_ffi_load()
+{
+#if HAVE_INT128
+	ffi_type *i128, *u128;
+
+	i128 = calloc(1, 3*sizeof(ffi_type));
+	i128->type = FFI_TYPE_STRUCT;
+	i128->size = 0;
+	i128->elements = (ffi_type **) (i128 + 1);
+	i128->elements[0] = &ffi_type_sint64;
+	i128->elements[1] = &ffi_type_sint64;
+
+	ffi_type_sint128 = i128;
+
+	u128 = calloc(1, 3*sizeof(ffi_type));
+	u128->type = FFI_TYPE_STRUCT;
+	u128->size = 0;
+	u128->elements = (ffi_type **) (u128 + 1);
+	u128->elements[0] = &ffi_type_uint64;
+	u128->elements[1] = &ffi_type_uint64;
+
+	ffi_type_uint128 = u128;
+#endif
+	return SUCCESS;
+}
+
+static void psi_ffi_free()
+{
+#if HAVE_INT128
+	free(ffi_type_sint128);
+	free(ffi_type_uint128);
+#endif
+}
+
+static struct psi_context_ops ops = {
+	psi_ffi_load,
+	psi_ffi_free,
 	psi_ffi_init,
 	psi_ffi_dtor,
 	psi_ffi_compile,
 	psi_ffi_call,
+	psi_ffi_query,
 };
 
-PSI_ContextOps *PSI_Libffi(void)
+struct psi_context_ops *psi_libffi_ops(void)
 {
 	return &ops;
 }