X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Flibjit.c;h=942696670724d907957850bb2d52be46e82efba1;hp=da8f25e5ae2dbc786251a01dd1fc6f40164fe4a7;hb=ef4e043826e92afd32000b7d945cdf86a6e9a223;hpb=9bcb1df0786a8193d65949c857baaba2f4296e84

diff --git a/src/libjit.c b/src/libjit.c
index da8f25e..9426966 100644
--- a/src/libjit.c
+++ b/src/libjit.c
@@ -23,26 +23,72 @@
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *******************************************************************************/
 
-#include "php_psi_stdinc.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#else
+# include "php_config.h"
+#endif
 #include "context.h"
 #include "call.h"
 #include "php.h"
 
 #ifdef HAVE_LIBJIT
 
+#include "libjit.h"
 #include <jit/jit.h>
 
-static inline jit_type_t psi_jit_decl_arg_type(struct psi_decl_arg *darg);
+#if HAVE_INT128
+static jit_type_t jit_type_llong;
+static jit_type_t jit_type_ullong;
+#endif
+
+struct psi_jit_context {
+	jit_context_t jit;
+	jit_type_t signature;
+};
+
+struct psi_jit_callback_info {
+	struct psi_jit_impl_info *impl_info;
+	struct psi_let_exp *let_exp;
+
+	void *closure;
+};
+
+struct psi_jit_decl_info {
+	jit_type_t signature;
+	struct psi_jit_struct_info *rv_array;
+	void *params[1];
+};
+
+struct psi_jit_extvar_info {
+	struct {
+		jit_type_t signature;
+		void *closure;
+	} get;
+	struct {
+		jit_type_t signature;
+		jit_type_t params[1];
+		void *closure;
+	} set;
+};
+
+struct psi_jit_impl_info {
+	struct psi_context *context;
+	struct psi_call_frame *frame;
+
+	void *closure;
+};
+
+struct psi_jit_struct_info {
+	jit_type_t strct;
+	struct psi_plist *eles;
+};
 
-static inline jit_abi_t psi_jit_abi(const char *convention)
-{
-	return jit_abi_cdecl;
-}
 static inline jit_type_t psi_jit_token_type(token_t t)
 {
 	switch (t) {
 	default:
-		ZEND_ASSERT(0);
+		assert(0);
 		/* no break */
 	case PSI_T_VOID:
 		return jit_type_void;
@@ -62,13 +108,16 @@ static inline jit_type_t psi_jit_token_type(token_t t)
 		return jit_type_long;
 	case PSI_T_UINT64:
 		return jit_type_ulong;
+#if HAVE_INT128
+	case PSI_T_INT128:
+		return jit_type_llong;
+	case PSI_T_UINT128:
+		return jit_type_ullong;
+#endif
 	case PSI_T_BOOL:
 		return jit_type_sys_bool;
-	case PSI_T_INT:
 	case PSI_T_ENUM:
 		return jit_type_sys_int;
-	case PSI_T_LONG:
-		return jit_type_sys_long;
 	case PSI_T_FLOAT:
 		return jit_type_sys_float;
 	case PSI_T_DOUBLE:
@@ -94,452 +143,463 @@ static inline jit_type_t psi_jit_impl_type(token_t impl_type)
 	case PSI_T_FLOAT:
 	case PSI_T_DOUBLE:
 		return jit_type_sys_double;
-	EMPTY_SWITCH_DEFAULT_CASE()
-		;
+	EMPTY_SWITCH_DEFAULT_CASE();
 	}
 	return NULL;
 }
 
-static void psi_jit_struct_type_dtor(void *type)
+static void psi_jit_type_free(jit_type_t *typ_ptr)
 {
-	jit_type_t strct = type;
-
-	jit_type_free(strct);
+	jit_type_free(*typ_ptr);
 }
 
-static size_t psi_jit_struct_type_pad(jit_type_t *els, size_t padding)
+static inline jit_abi_t psi_jit_abi(zend_string *convention)
 {
-	size_t i;
-
-	for (i = 0; i < padding; ++i) {
-		*els++ = jit_type_copy(jit_type_sys_char);
+	if (zend_string_equals_literal(convention, "stdcall")) {
+		return jit_abi_stdcall;
 	}
-
-	return padding;
+	if (zend_string_equals_literal(convention, "fastcall")) {
+		return jit_abi_fastcall;
+	}
+	return jit_abi_cdecl;
 }
 
-static unsigned psi_jit_struct_type_elements(struct psi_decl_struct *strct,
-		jit_type_t **fields)
+static void psi_jit_handler(jit_type_t sig, void *result, void **args, void *data)
 {
-	size_t i = 0, argc = psi_plist_count(strct->args), nels = 0, offset = 0,
-			maxalign;
-	struct psi_decl_arg *darg;
-
-	*fields = calloc(argc + 1, sizeof(*fields));
-
-	while (psi_plist_get(strct->args, i++, &darg)) {
-		jit_type_t type = jit_type_copy(psi_jit_decl_arg_type(darg));
-		size_t padding, alignment;
+	struct psi_impl *impl = data;
+	struct psi_jit_impl_info *info = impl->info;
 
-		if ((alignment = jit_type_get_alignment(type)) > maxalign) {
-			maxalign = alignment;
-		}
-
-		assert(jit_type_get_size(type) == darg->layout->len);
-		if ((padding = psi_offset_padding(darg->layout->pos - offset, alignment))) {
-			if (nels + padding > argc) {
-				argc += padding;
-				*fields = realloc(*fields, (argc + 1) * sizeof(*fields));
-			}
-			psi_jit_struct_type_pad(&(*fields)[nels], padding);
-			nels += padding;
-			offset += padding;
-		}
-		assert(offset == darg->layout->pos);
+	psi_context_call(info->context, *(zend_execute_data **)args[0], *(zval **) args[1], impl);
+}
 
-		offset = (offset + darg->layout->len + alignment - 1)
-				& ~(alignment - 1);
-		(*fields)[nels++] = type;
-	}
+static void psi_jit_callback(jit_type_t sig, void *result, void **args, void *data)
+{
+	struct psi_jit_callback_info *cb_info = data;
+	struct psi_call_frame_callback cb_data;
 
-	/* apply struct alignment padding */
-	offset = (offset + maxalign - 1) & ~(maxalign - 1);
+	assert(cb_info->impl_info->frame);
 
-	ZEND_ASSERT(offset <= strct->size);
-	if (offset < strct->size) {
-		nels += psi_jit_struct_type_pad(&(*fields)[nels], strct->size - offset);
-	}
+	cb_data.cb = cb_info->let_exp;
+	cb_data.argc = jit_type_num_params(sig);
+	cb_data.argv = args;
+	cb_data.rval = result;
 
-	return nels;
+	psi_call_frame_do_callback(cb_info->impl_info->frame, &cb_data);
 }
-static inline jit_type_t psi_jit_decl_type(struct psi_decl_type *type)
+
+static bool psi_jit_load(void)
 {
-	struct psi_decl_type *real = psi_decl_type_get_real(type);
+#if HAVE_INT128
+	jit_type_t ll_fields[2], ull_fields[2];
 
-	switch (real->type) {
-	case PSI_T_STRUCT:
-		if (!real->real.strct->engine.type) {
-			unsigned count;
-			jit_type_t strct, *fields = NULL;
+	ll_fields[0] = ll_fields[1] = jit_type_long;
+	jit_type_llong = jit_type_create_struct(ll_fields, 2, 1);
 
-			count = psi_jit_struct_type_elements(real->real.strct, &fields);
-			strct = jit_type_create_struct(fields, count, 0);
+	ull_fields[0] = ull_fields[1] = jit_type_ulong;
+	jit_type_ullong = jit_type_create_struct(ull_fields, 2, 1);
+#endif
+	return true;
+}
 
-			real->real.strct->engine.type = strct;
-			real->real.strct->engine.dtor = psi_jit_struct_type_dtor;
-		}
+static void psi_jit_free(void)
+{
+#if HAVE_INT128
+	jit_type_free(jit_type_llong);
+	jit_type_free(jit_type_ullong);
+#endif
+}
 
-		return real->real.strct->engine.type;
+static bool psi_jit_init(struct psi_context *C)
+{
+	struct psi_jit_context *context = pecalloc(1, sizeof(*context), 1);
+	jit_type_t params[] = {jit_type_void_ptr, jit_type_void_ptr};
 
-	case PSI_T_UNION:
-		{
-			struct psi_decl_arg *arg;
-			psi_plist_get(real->real.unn->args, 0, &arg);
-			return psi_jit_decl_arg_type(arg);
-		}
+	context->jit = jit_context_create();
+	if (!context->jit) {
+		pefree(context, 1);
+		return false;
+	}
 
-	default:
-		return psi_jit_token_type(real->type);
+	context->signature = jit_type_create_signature(jit_abi_fastcall, jit_type_void,
+			params, 2, 1);
+	if (!context->signature) {
+		jit_context_destroy(context->jit);
+		pefree(context, 1);
+		return false;
 	}
+
+	C->context = context;
+	return true;
 }
-static inline jit_type_t psi_jit_decl_arg_type(struct psi_decl_arg *darg)
+
+static void psi_jit_dtor(struct psi_context *C)
 {
-	if (darg->var->pointer_level) {
-		return jit_type_void_ptr;
-	} else {
-		return psi_jit_decl_type(darg->type);
+	if (C->context) {
+		struct psi_jit_context *context = C->context;
+
+		jit_type_free(context->signature);
+		jit_context_destroy(context->jit);
+
+		pefree(C->context, 1);
+		C->context = NULL;
 	}
 }
 
-struct psi_jit_context {
-	jit_context_t jit;
-	jit_type_t signature;
-};
-
-struct psi_jit_call {
-	struct psi_context *context;
-	union {
-		struct {
-			struct psi_impl *impl;
-			struct psi_call_frame *frame;
-		} fn;
-		struct {
-			struct psi_let_exp *let_exp;
-			struct psi_jit_call *impl_call;
-		} cb;
-	} impl;
-	void *closure;
-	jit_type_t signature;
-	void *params[1]; /* [type1, type2, ... ] */
-};
 
-static void psi_jit_handler(jit_type_t sig, void *result, void **args, void *data)
+static bool psi_jit_composite_init(struct psi_context *C,
+		struct psi_decl_arg *darg)
 {
-	struct psi_jit_call *call = data;
+	struct psi_jit_struct_info *info;
 
-	psi_context_call(call->context, *(zend_execute_data **)args[0], *(zval **) args[1], call->impl.fn.impl);
-}
+	if (darg->engine.type) {
+		return true;
+	}
 
-static void psi_jit_callback(jit_type_t sig, void *result, void **args,
-		void *data)
-{
-	struct psi_jit_call *call = data, *impl_call = call->impl.cb.impl_call;
-	struct psi_call_frame_callback cbdata;
+	info = pecalloc(1, sizeof(*info), 1);
+	info->eles = psi_plist_init((psi_plist_dtor) psi_jit_type_free);
+	psi_context_composite_type_elements(C, darg, &info->eles);
+	info->strct = jit_type_create_struct((jit_type_t *)
+			psi_plist_eles(info->eles),
+			psi_plist_count(info->eles), 0);
 
-	cbdata.cb = call->impl.cb.let_exp;
-	cbdata.argc = jit_type_num_params(sig);
-	cbdata.argv = args;
-	cbdata.rval = result;
+	darg->engine.info = info;
+	darg->engine.type = info->strct;
 
-	psi_call_frame_do_callback(impl_call->impl.fn.frame, &cbdata);
+	return true;
 }
 
-static inline struct psi_jit_call *psi_jit_call_alloc(struct psi_context *C,
-		struct psi_decl *decl)
+static void psi_jit_composite_dtor(struct psi_context *C,
+		struct psi_decl_arg *darg)
 {
-	size_t i, c = psi_plist_count(decl->args);
-	struct psi_jit_call *call = calloc(1, sizeof(*call) + 2 * c * sizeof(void *));
-	struct psi_decl_arg *arg;
-
-	decl->info = call;
-	call->context = C;
-	for (i = 0; psi_plist_get(decl->args, i, &arg); ++i) {
-		call->params[i] = psi_jit_decl_arg_type(arg);
-	}
-	call->params[c] = NULL;
+	struct psi_jit_struct_info *info = darg->engine.info;
 
-	call->signature = jit_type_create_signature(
-			psi_jit_abi(decl->abi->convention),
-			psi_jit_decl_arg_type(decl->func),
-			(jit_type_t *) call->params,
-			c, 1);
-	assert(call->signature);
+	if (info) {
+		darg->engine.info = NULL;
+		darg->engine.type = NULL;
 
-	return call;
+		jit_type_free(info->strct);
+		/* just free */
+		pefree(info->eles, 1);
+		pefree(info, 1);
+	}
 }
 
-static inline void *psi_jit_call_init_closure(struct psi_context *C,
-		struct psi_jit_call *call, struct psi_impl *impl)
+static void psi_jit_extvar_get(jit_type_t sig, void *result, void **args, void *data)
 {
-	struct psi_jit_context *context = C->context;
+	struct psi_decl_extvar *evar = data;
 
-	call->impl.fn.impl = impl;
-	return call->closure = jit_closure_create(context->jit, context->signature,
-			&psi_jit_handler, call);
+	psi_decl_extvar_get(evar, result);
 }
 
-static inline void *psi_jit_call_init_callback_closure(struct psi_context *C,
-		struct psi_jit_call *call, struct psi_jit_call *impl_call,
-		struct psi_let_exp *cb)
+static void psi_jit_extvar_set(jit_type_t sig, void *result, void **args, void *data)
 {
-	struct psi_jit_context *context = C->context;
+	struct psi_decl_extvar *evar = data;
 
-	call->impl.cb.let_exp = cb;
-	call->impl.cb.impl_call = impl_call;
-
-	return call->closure = jit_closure_create(context->jit, call->signature,
-			&psi_jit_callback, call);
+	psi_decl_extvar_set(evar, args[0]);
 }
 
-static inline void psi_jit_call_free(struct psi_jit_call *call)
-{
-	jit_type_free(call->signature);
-	free(call);
-}
+static bool psi_jit_decl_init(struct psi_context *, struct psi_decl *);
 
-static inline struct psi_jit_context *psi_jit_context_init(
-		struct psi_jit_context *L)
+static bool psi_jit_extvar_init(struct psi_context *C,
+		struct psi_decl_extvar *evar)
 {
-	jit_type_t params[] = {jit_type_void_ptr, jit_type_void_ptr};
+	struct psi_jit_context *ctx = C->context;
+	struct psi_jit_extvar_info *info = pecalloc(1, sizeof(*info), 1);
 
-	if (!L) {
-		L = malloc(sizeof(*L));
+	evar->info = info;
+
+	psi_jit_decl_init(C, evar->getter);
+	psi_jit_decl_init(C, evar->setter);
+
+	jit_context_build_start(ctx->jit);
+
+	info->get.signature = jit_type_create_signature(jit_abi_cdecl,
+			psi_context_decl_arg_call_type(C, evar->getter->func), NULL, 0, 1);
+	if (!info->get.signature) {
+		goto failure;
+	}
+	info->get.closure = jit_closure_create(ctx->jit, info->get.signature,
+			psi_jit_extvar_get, evar);
+	if (!info->get.closure) {
+		goto failure;
 	}
-	memset(L, 0, sizeof(*L));
 
-	L->jit = jit_context_create();
-	L->signature = jit_type_create_signature(jit_abi_cdecl, jit_type_void,
-			params, 2, 1);
+	info->set.params[0] = psi_context_decl_arg_call_type(C, evar->arg);
+	info->set.signature = jit_type_create_signature(jit_abi_cdecl,
+			psi_context_decl_arg_call_type(C, evar->setter->func),
+			info->set.params, 1, 1);
+	if (!info->set.signature) {
+		goto failure;
+	}
+	info->set.closure = jit_closure_create(ctx->jit, info->set.signature,
+			psi_jit_extvar_set, evar);
+	if (!info->set.closure) {
+		goto failure;
+	}
 
-	return L;
-}
+	evar->getter->sym = info->get.closure;
+	evar->setter->sym = info->set.closure;
 
-static inline void psi_jit_context_dtor(struct psi_jit_context *L)
-{
-	jit_type_free(L->signature);
-	jit_context_destroy(L->jit);
+	jit_context_build_end(ctx->jit);
+	return true;
+failure: ;
+	jit_context_build_end(ctx->jit);
+	return false;
 }
 
-static inline void psi_jit_context_free(struct psi_jit_context **L)
-{
-	if (*L) {
-		psi_jit_context_dtor(*L);
-		free(*L);
-		*L = NULL;
+static void psi_jit_extvar_dtor(struct psi_context *C,
+		struct psi_decl_extvar *evar) {
+	if (evar->info) {
+		pefree(evar->info, 1);
+		evar->info = NULL;
 	}
 }
 
-static void psi_jit_init(struct psi_context *C)
+static bool psi_jit_decl_init(struct psi_context *C, struct psi_decl *decl)
 {
-	C->context = psi_jit_context_init(NULL);
-}
+	if (!decl->info) {
+		struct psi_jit_context *ctx = C->context;
+		size_t i, c = psi_plist_count(decl->args);
+		struct psi_decl_arg *arg;
+		struct psi_jit_decl_info *info = pecalloc(1,
+				sizeof(*info) + 2 * c * sizeof(void *), 1);
 
-static inline void psi_jit_destroy_callbacks(struct psi_context *C,
-		struct psi_let_exp *let_exp)
-{
-	struct psi_let_callback *cb;
-	struct psi_let_func *fn = NULL;
+		decl->info = info;
 
-	switch (let_exp->kind) {
-	case PSI_LET_CALLBACK:
-		cb = let_exp->data.callback;
+		jit_context_build_start(ctx->jit);
 
-		if (cb->decl && cb->decl->info) {
-			psi_jit_call_free(cb->decl->info);
-		}
-		fn = cb->func;
-		/* no break */
-	case PSI_LET_FUNC:
-		if (!fn) {
-			fn = let_exp->data.func;
+		for (i = 0; psi_plist_get(decl->args, i, &arg); ++i) {
+			info->params[i] = psi_context_decl_arg_call_type(C, arg);
 		}
+		info->params[c] = NULL;
 
-		if (fn->inner) {
-			size_t i = 0;
-			struct psi_let_exp *inner_let;
+		info->signature = jit_type_create_signature(
+				psi_jit_abi(decl->abi->convention),
+				psi_context_decl_arg_full_type(C, decl->func),
+				(jit_type_t *) info->params, c, 1);
 
-			while (psi_plist_get(fn->inner, i++, &inner_let)) {
-				psi_jit_destroy_callbacks(C, inner_let);
-			}
-		}
-		break;
-	default:
-		break;
-	}
-}
+		jit_context_build_end(ctx->jit);
 
-static void psi_jit_dtor(struct psi_context *C)
-{
-	if (C->decls) {
-		size_t i = 0;
-		struct psi_decl *decl;
-
-		while (psi_plist_get(C->decls, i++, &decl)) {
-			if (decl->info) {
-				psi_jit_call_free(decl->info);
-			}
+		if (!info->signature) {
+			pefree(info, 1);
+			decl->info = NULL;
+			return false;
 		}
 	}
-	if (C->impls) {
-		size_t i = 0;
-		struct psi_impl *impl;
 
-		while (psi_plist_get(C->impls, i++, &impl)) {
-			size_t l = 0;
-			struct psi_let_stmt *let;
-
-			while (psi_plist_get(impl->stmts.let, l++, &let)) {
-				psi_jit_destroy_callbacks(C, let->exp);
-			}
-		}
-	}
-	psi_jit_context_free((void *) &C->context);
+	return true;
 }
 
-static inline void psi_jit_compile_callbacks(struct psi_context *C,
-		struct psi_jit_call *impl_call, struct psi_let_exp *let_exp)
-{
-	struct psi_jit_call *call;
-	struct psi_let_callback *cb;
-	struct psi_let_func *fn = NULL;
-
-	switch (let_exp->kind) {
-	case PSI_LET_CALLBACK:
-		cb = let_exp->data.callback;
-		if ((call = psi_jit_call_alloc(C, cb->decl))) {
-			if (!psi_jit_call_init_callback_closure(C, call, impl_call, let_exp)) {
-				psi_jit_call_free(call);
-				break;
-			}
-
-			cb->decl->sym = call->closure;
-		}
-		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;
+static void psi_jit_decl_dtor(struct psi_context *C, struct psi_decl *decl) {
+	if (decl->info) {
+		struct psi_jit_decl_info *info = decl->info;
 
-			while (psi_plist_get(fn->inner, i++, &inner_let)) {
-				psi_jit_compile_callbacks(C, impl_call, inner_let);
-			}
-		}
-		break;
-	default:
-		break;
+		jit_type_free(info->signature);
+		pefree(info, 1);
+		decl->info = NULL;
 	}
 }
 
-static zend_function_entry *psi_jit_compile(struct psi_context *C)
+static bool psi_jit_impl_init(struct psi_context *C,
+		struct psi_impl *impl, zif_handler *zh)
 {
-	size_t i = 0, d = 0, nf = 0;
-	struct psi_impl *impl;
-	struct psi_decl *decl;
-	zend_function_entry *zfe;
-	struct psi_jit_context *ctx = C->context;
+	struct psi_jit_context *context = C->context;
+	struct psi_jit_impl_info *info = calloc(1, sizeof(*info));
+
+	impl->info = info;
+	info->context = C;
+
+	info->closure = jit_closure_create(context->jit, context->signature,
+			&psi_jit_handler, impl);
 
-	if (!C->impls) {
-		return NULL;
+	if (!info->closure) {
+		goto failure;
 	}
 
-	zfe = calloc(psi_plist_count(C->impls) + 1, sizeof(*zfe));
-	jit_context_build_start(ctx->jit);
+	*zh = info->closure;
+	return true;
 
-	while (psi_plist_get(C->impls, i++, &impl)) {
-		zend_function_entry *zf = &zfe[nf];
-		struct psi_jit_call *call;
-		size_t l = 0;
-		struct psi_let_stmt *let;
+failure: ;
+	impl->info = NULL;
+	pefree(info, 1);
+	return false;
+}
 
-		if (!impl->decl) {
-			continue;
-		}
-		if (!(call = psi_jit_call_alloc(C, impl->decl))) {
-			continue;
-		}
-		if (!psi_jit_call_init_closure(C, call, impl)) {
-			psi_jit_call_free(call);
-			continue;
-		}
 
-		zf->fname = impl->func->name + (impl->func->name[0] == '\\');
-		zf->handler = call->closure;
-		zf->num_args = psi_plist_count(impl->func->args);
-		zf->arg_info = psi_internal_arginfo(impl);
-		++nf;
+static void psi_jit_impl_dtor(struct psi_context *C, struct psi_impl *impl) {
+	struct psi_jit_impl_info *info = impl->info;
 
-		while (psi_plist_get(impl->stmts.let, l++, &let)) {
-			psi_jit_compile_callbacks(C, call, let->exp);
-		}
+	if (info) {
+		/* The memory for the closure will be reclaimed
+		 * when the context is destroyed.
+		 */
+		pefree(info, 1);
+		impl->info = NULL;
 	}
+}
 
-	while (psi_plist_get(C->decls, d++, &decl)) {
-		if (decl->info) {
-			continue;
-		}
+static bool psi_jit_cb_init(struct psi_context *C,
+		struct psi_let_exp *exp, struct psi_impl *impl)
+{
+	struct psi_jit_context *context = C->context;
+	struct psi_jit_callback_info *cb_info;
+	struct psi_jit_decl_info *decl_info;
 
-		psi_jit_call_alloc(C, decl);
+	assert(exp->kind == PSI_LET_CALLBACK);
+
+	if (!psi_jit_decl_init(C, exp->data.callback->decl)) {
+		return false;
 	}
 
-	jit_context_build_end(ctx->jit);
+	cb_info = pecalloc(1, sizeof(*cb_info), 1);
+	cb_info->impl_info = impl->info;
+	cb_info->let_exp = exp;
 
-	return zfe;
+	decl_info = exp->data.callback->decl->info;
+	cb_info->closure = jit_closure_create(context->jit, decl_info->signature,
+			&psi_jit_callback, cb_info);
+
+	if (!cb_info->closure) {
+		free(cb_info);
+		return false;
+	}
+
+	assert(!exp->data.callback->decl->sym);
+	exp->data.callback->info = cb_info;
+	exp->data.callback->decl->sym = cb_info->closure;
+
+	return true;
 }
 
-static void psi_jit_call(struct psi_context *C, struct psi_call_frame *frame,
-		struct psi_decl *decl, void *rval, void **args)
+static void psi_jit_cb_dtor(struct psi_context *C,
+		struct psi_let_exp *let_exp, struct psi_impl *impl)
 {
-	struct psi_jit_call *call = decl->info;
-	struct psi_call_frame *prev = call->impl.fn.frame;
+	assert(let_exp->kind == PSI_LET_CALLBACK);
+
+	psi_jit_decl_dtor(C, let_exp->data.callback->decl);
 
-	call->impl.fn.frame = frame;
-	jit_apply(call->signature, decl->sym, args, psi_plist_count(decl->args), rval);
-	call->impl.fn.frame = prev;
+	if (let_exp->data.callback->info) {
+		struct psi_jit_callback_info *info = let_exp->data.callback->info;
+
+		/* The memory for the closure will be reclaimed
+		 * when the context is destroyed.
+		 */
+		pefree(info, 1);
+		let_exp->data.callback->info = NULL;
+	}
 }
 
-static void psi_jit_call_va(struct psi_context *C, struct psi_call_frame *frame,
-		struct psi_decl *decl, void *rval, void **args, size_t va_count,
-		void **va_types)
-{
-	struct psi_jit_call *info = decl->info;
-	struct psi_call_frame *prev = info->impl.fn.frame;
-	size_t argc = psi_plist_count(decl->args);
-	jit_type_t signature;
-	jit_type_t *param_types = ecalloc(argc + va_count + 1, sizeof(jit_type_t));
+static void psi_jit_call(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_jit_decl_info *decl_info = decl->info;
+	struct psi_jit_impl_info *impl_info;
+	struct psi_call_frame *prev;
+
+	if (impl) {
+		impl_info = impl->info;
+		prev = impl_info->frame;
+		impl_info->frame = frame;
+	}
+	jit_apply(decl_info->signature, decl->sym,
+			psi_call_frame_get_arg_pointers(frame), psi_plist_count(decl->args),
+			psi_call_frame_get_rpointer(frame));
+	if (impl) {
+		impl_info->frame = prev;
+	}
+}
 
-	memcpy(param_types, info->params, argc * sizeof(jit_type_t));
-	memcpy(param_types + argc, va_types, va_count * sizeof(jit_type_t));
+static void psi_jit_call_va(struct psi_call_frame *frame) {
+	jit_type_t 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_jit_decl_info *decl_info = decl->info;
+	struct psi_jit_impl_info *impl_info;
+	size_t i, va_count, argc;
+	jit_type_t *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(jit_type_t));
+	memcpy(param_types, decl_info->params, argc * sizeof(jit_type_t));
+	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_jit_impl_type(frame_arg->va_type);
+	}
 
 	signature = jit_type_create_signature(jit_abi_vararg,
-			jit_type_get_return(info->signature), param_types, argc + va_count,
-			1);
-	ZEND_ASSERT(signature);
+			jit_type_get_return(decl_info->signature),
+			param_types, argc + va_count, 1);
+	assert(signature);
+
+	if (impl) {
+		impl_info = impl->info;
+		prev = impl_info->frame;
+		impl_info->frame = frame;
+	}
+	jit_apply(signature, decl->sym,
+			psi_call_frame_get_arg_pointers(frame), argc,
+			psi_call_frame_get_rpointer(frame));
+	if (impl) {
+		impl_info->frame = prev;
+	}
 
-	info->impl.fn.frame = frame;
-	jit_apply(signature, decl->sym, args, argc, rval);
-	info->impl.fn.frame = prev;
 	jit_type_free(signature);
+
 	efree(param_types);
 }
 
-static void *psi_jit_query(struct psi_context *C, enum psi_context_query q,
-		void *arg)
+static void *psi_jit_typeof_impl(struct psi_context *C, token_t impl_type)
 {
-	switch (q) {
-	case PSI_CONTEXT_QUERY_SELF:
-		return "jit";
-	case PSI_CONTEXT_QUERY_TYPE:
-		return psi_jit_impl_type(*(token_t *) arg);
-	}
-	return NULL;
+	return psi_jit_impl_type(impl_type);
+}
+
+static void *psi_jit_typeof_decl(struct psi_context *C, token_t decl_type)
+{
+	return psi_jit_token_type(decl_type);
+}
+
+static void *psi_jit_copyof_type(struct psi_context *C, void *orig_type)
+{
+	return jit_type_copy(orig_type);
 }
 
-static struct psi_context_ops ops = {psi_jit_init, psi_jit_dtor,
-		psi_jit_compile, psi_jit_call, psi_jit_call_va, psi_jit_query};
+static void psi_jit_layoutof_type(struct psi_context *C, void *orig_type,
+		struct psi_layout *l)
+{
+	l->pos = jit_type_get_alignment(orig_type);
+	l->len = jit_type_get_size(orig_type);
+
+	assert(l->pos);
+	assert(l->len);
+}
+
+static struct psi_context_ops ops = {
+	"libjit",
+	psi_jit_load,
+	psi_jit_free,
+	psi_jit_init,
+	psi_jit_dtor,
+	psi_jit_composite_init,
+	psi_jit_composite_dtor,
+	psi_jit_extvar_init,
+	psi_jit_extvar_dtor,
+	psi_jit_decl_init,
+	psi_jit_decl_dtor,
+	psi_jit_impl_init,
+	psi_jit_impl_dtor,
+	psi_jit_cb_init,
+	psi_jit_cb_dtor,
+	psi_jit_call,
+	psi_jit_call_va,
+	psi_jit_typeof_impl,
+	psi_jit_typeof_decl,
+	psi_jit_copyof_type,
+	psi_jit_layoutof_type,
+};
 
 struct psi_context_ops *psi_libjit_ops(void)
 {