X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Flibjit.c;h=7b0a49a5cadd6748edd886ba5345570c9d292ddf;hp=e1d6cf866252f9bd8ae07d2685bc73e0a786fc61;hb=c0999079ea85fecba8ab5eec386541fc1ce733b7;hpb=d560a27ff8431c678d25ecf4d8190b562a766f41

diff --git a/src/libjit.c b/src/libjit.c
index e1d6cf8..7b0a49a 100644
--- a/src/libjit.c
+++ b/src/libjit.c
@@ -1,15 +1,23 @@
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "php.h"
+
+#ifdef HAVE_LIBJIT
+
 #include "php_psi.h"
 #include "libjit.h"
 
 #include <jit/jit.h>
 
 static void psi_jit_handler(jit_type_t _sig, void *result, void **_args, void *_data);
+static inline jit_type_t psi_jit_decl_arg_type(decl_arg *darg);
 
 static inline jit_abi_t psi_jit_abi(const char *convention) {
 	return jit_abi_cdecl;
 }
-static inline jit_type_t psi_jit_type(token_t t) {
+static inline jit_type_t psi_jit_token_type(token_t t) {
 	switch (t) {
 	default:
 		ZEND_ASSERT(0);
@@ -36,14 +44,109 @@ static inline jit_type_t psi_jit_type(token_t t) {
 		return jit_type_sys_bool;
 	case PSI_T_INT:
 		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:
 		return jit_type_sys_double;
+#ifdef HAVE_LONG_DOUBLE
+	case PSI_T_LONG_DOUBLE:
+		return jit_type_sys_long_double;
+#endif
+	case PSI_T_POINTER:
+		return jit_type_void_ptr;
+	}
+}
+static inline jit_type_t psi_jit_impl_type(token_t impl_type) {
+	switch (impl_type) {
+	case PSI_T_BOOL:
+		return jit_type_sbyte;
+	case PSI_T_INT:
+		return jit_type_long;
+	case PSI_T_STRING:
+		return jit_type_void_ptr;
+	case PSI_T_FLOAT:
+	case PSI_T_DOUBLE:
+		return jit_type_sys_double;
+	EMPTY_SWITCH_DEFAULT_CASE();
+	}
+	return NULL;
+}
+static void psi_jit_struct_type_dtor(void *type) {
+	jit_type_t strct = type;
+
+	jit_type_free(strct);
+}
+
+static size_t psi_jit_struct_type_pad(jit_type_t **els, size_t padding) {
+	size_t i;
+
+	for (i = 0; i < padding; ++i) {
+		*els++ = jit_type_copy(jit_type_sys_char);
+	}
+
+	return padding;
+}
+
+static unsigned psi_jit_struct_type_elements(decl_struct *strct, jit_type_t **fields) {
+	size_t i, j, argc = strct->args->count, nels = 0, offset = 0, maxalign;
+	*fields = calloc(argc + 1, sizeof(*fields));
+
+	for (i = 0; i < strct->args->count; ++i) {
+		decl_arg *darg = strct->args->args[i];
+		jit_type_t type = jit_type_copy(psi_jit_decl_arg_type(darg));
+		size_t padding, alignment;
+
+		ZEND_ASSERT(jit_type_get_size(type) == darg->layout->len);
+
+		if ((alignment = jit_type_get_alignment(type)) > maxalign) {
+			maxalign = alignment;
+		}
+
+		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;
+		}
+		ZEND_ASSERT(offset == darg->layout->pos);
+
+		offset = (offset + darg->layout->len + alignment - 1) & ~(alignment - 1);
+		(*fields)[nels++] = type;
+	}
+
+	/* apply struct alignment padding */
+	offset = (offset + maxalign - 1) & ~(maxalign - 1);
+
+	ZEND_ASSERT(offset <= strct->size);
+	if (offset < strct->size) {
+		nels += psi_jit_struct_type_pad(&(*fields)[nels], strct->size - offset);
 	}
+
+	return nels;
 }
 static inline jit_type_t psi_jit_decl_type(decl_type *type) {
-	return psi_jit_type(real_decl_type(type)->type);
+	decl_type *real = real_decl_type(type);
+
+	if (real->type == PSI_T_STRUCT) {
+		if (!real->strct->engine.type) {
+			unsigned count;
+			jit_type_t strct, *fields = NULL;
+
+			count = psi_jit_struct_type_elements(real->strct, &fields);
+			strct = jit_type_create_struct(fields, count, 0);
+
+			real->strct->engine.type = strct;
+			real->strct->engine.dtor = psi_jit_struct_type_dtor;
+		}
+
+		return real->strct->engine.type;
+	}
+	return psi_jit_token_type(real->type);
 }
 static inline jit_type_t psi_jit_decl_arg_type(decl_arg *darg) {
 	if (darg->var->pointer_level) {
@@ -62,44 +165,48 @@ typedef struct PSI_LibjitContext {
 	} data;
 } PSI_LibjitContext;
 
+typedef struct PSI_LibjitCall {
+	void *closure;
+	jit_type_t signature;
+	void *params[1]; /* [type1, type2, NULL, arg1, arg2] ... */
+} PSI_LibjitCall;
+
 typedef struct PSI_LibjitData {
 	PSI_LibjitContext *context;
 	impl *impl;
 	zend_internal_arg_info *arginfo;
-	void *closure;
-	jit_type_t signature;
-	jit_type_t params[1];
 } PSI_LibjitData;
 
-static inline PSI_LibjitData *PSI_LibjitDataAlloc(PSI_LibjitContext *context, impl *impl) {
-	size_t i, c = impl->decl->args->count;
-	PSI_LibjitData *data = malloc(sizeof(*data) + (c ? c-1 : c) * sizeof(jit_type_t));
+static inline PSI_LibjitCall *PSI_LibjitCallAlloc(PSI_Context *C, decl *decl) {
+	size_t i, c = decl->args ? decl->args->count : 0;
+	PSI_LibjitCall *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_jit_decl_arg_type(impl->decl->args->args[i]);
+		call->params[i] = psi_jit_decl_arg_type(decl->args->args[i]);
 	}
+	call->params[c] = NULL;
 
-	data->signature = jit_type_create_signature(
-		psi_jit_abi(data->impl->decl->abi->convention),
-		psi_jit_decl_arg_type(data->impl->decl->func),
-		data->params,
-		data->impl->decl->args->count,
-		1);
-	data->closure = jit_closure_create(context->jit, context->signature, &psi_jit_handler, data);
+	decl->call.info = call;
+	decl->call.rval = &decl->func->ptr;
+	decl->call.argc = c;
+	decl->call.args = (void **) &call->params[c+1];
 
-	context->data.list = realloc(context->data.list, ++context->data.count * sizeof(*context->data.list));
-	context->data.list[context->data.count-1] = data;
+	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);
+	return call;
+}
 
-	return data;
+static inline void PSI_LibjitCallInitClosure(PSI_Context *C, PSI_LibjitCall *call, impl *impl) {
+	PSI_LibjitContext *context = C->context;
+	call->closure = jit_closure_create(context->jit, context->signature,
+			&psi_jit_handler, impl);
 }
 
-static inline void PSI_LibjitDataFree(PSI_LibjitData *data) {
-	free(data->arginfo);
-	jit_type_free(data->signature);
-	free(data);
+static inline void PSI_LibjitCallFree(PSI_LibjitCall *call) {
+	jit_type_free(call->signature);
+	free(call);
 }
 
 static inline PSI_LibjitContext *PSI_LibjitContextInit(PSI_LibjitContext *L) {
@@ -114,20 +221,13 @@ static inline PSI_LibjitContext *PSI_LibjitContextInit(PSI_LibjitContext *L) {
 	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);
+	L->signature = jit_type_create_signature(jit_abi_cdecl, jit_type_void,
+			params, 2, 1);
 
 	return L;
 }
 
 static inline void PSI_LibjitContextDtor(PSI_LibjitContext *L) {
-	size_t i;
-
-	for (i = 0; i < L->data.count; ++i) {
-		PSI_LibjitDataFree(L->data.list[i]);
-	}
-	if (L->data.list) {
-		free(L->data.list);
-	}
 	jit_type_free(L->signature);
 	jit_context_destroy(L->jit);
 }
@@ -142,48 +242,7 @@ static inline void PSI_LibjitContextFree(PSI_LibjitContext **L) {
 
 static void psi_jit_handler(jit_type_t _sig, void *result, void **_args, void *_data)
 {
-	PSI_LibjitData *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->count) {
-		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);
-		}
-	}
-
-	jit_apply(data->signature, data->impl->decl->dlptr, arg_prm, data->impl->decl->args->count, &ret_val);
-
-	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_jit_init(PSI_Context *C)
@@ -193,6 +252,15 @@ static void psi_jit_init(PSI_Context *C)
 
 static void psi_jit_dtor(PSI_Context *C)
 {
+	if (C->decls) {
+		size_t i;
+
+		for (i = 0; i < C->decls->count; ++i) {
+			decl *decl = C->decls->list[i];
+
+			PSI_LibjitCallFree(decl->call.info);
+		}
+	}
 	PSI_LibjitContextFree((void *) &C->context);
 }
 
@@ -211,51 +279,69 @@ static zend_function_entry *psi_jit_compile(PSI_Context *C)
 
 	for (i = 0; i < C->impls->count; ++i) {
 		zend_function_entry *zf = &zfe[j];
-		PSI_LibjitData *data;
+		PSI_LibjitCall *call;
+		impl *impl = C->impls->list[i];
 
-		if (!C->impls->list[i]->decl) {
+		if (!impl->decl) {
 			continue;
 		}
 
-		data = PSI_LibjitDataAlloc(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->closure;
-		zf->arg_info = data->arginfo;
+		call = PSI_LibjitCallAlloc(C, impl->decl);
+		PSI_LibjitCallInitClosure(C, call, impl);
+
+		zf->fname = impl->func->name + (impl->func->name[0] == '\\');
+		zf->num_args = impl->func->args->count;
+		zf->handler = call->closure;
+		zf->arg_info = psi_internal_arginfo(impl);
 		++j;
 	}
 
+	for (i = 0; i < C->decls->count; ++i) {
+		decl *decl = C->decls->list[i];
+
+		if (decl->impl) {
+			continue;
+		}
+
+		PSI_LibjitCallAlloc(C, decl);
+	}
+
 	jit_context_build_end(ctx->jit);
 
 	return zfe;
 }
 
-static void psi_jit_call(PSI_Context *C, impl_val *ret_val, decl *decl, impl_val **args) {
-	jit_type_t signature, *types;
-	void **argps;
-	size_t i;
-
-	/* FIXME: cache in decl */
+static void psi_jit_call(PSI_Context *C, decl_callinfo *decl_call, impl_vararg *va) {
+	PSI_LibjitCall *call = decl_call->info;
 
-	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 (va) {
+		jit_type_t signature;
+		size_t i, nfixedargs = decl_call->argc, ntotalargs = nfixedargs + va->args->count;
+		void **params = calloc(2 * ntotalargs + 2, sizeof(void *));
 
-		types[i] = psi_jit_decl_arg_type(darg);
-		argps[i] = args[i];
-	}
-
-	signature = jit_type_create_signature(
-			psi_jit_abi(decl->abi->convention),
-			psi_jit_decl_arg_type(decl->func),
-			types, decl->args->count, 1);
-	jit_apply(signature, decl->dlptr, argps, decl->args->count, ret_val);
+		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_jit_impl_type(va->types[i]);
+			params[nfixedargs + i + ntotalargs + 1] = &va->values[i];
+		}
 
-	jit_type_free(signature);
-	free(types);
-	free(argps);
+		signature = jit_type_create_signature(
+				jit_type_get_abi(call->signature),
+				jit_type_get_return(call->signature),
+				(jit_type_t *) params, ntotalargs, 1);
+		ZEND_ASSERT(signature);
 
+		jit_apply(signature, decl_call->sym, &params[ntotalargs + 1],
+						nfixedargs, *decl_call->rval);
+		jit_type_free(signature);
+		free(params);
+	} else {
+		jit_apply(call->signature, decl_call->sym, decl_call->args,
+				decl_call->argc, *decl_call->rval);
+	}
 }
 
 static PSI_ContextOps ops = {
@@ -269,3 +355,5 @@ PSI_ContextOps *PSI_Libjit(void)
 {
 	return &ops;
 }
+
+#endif /* HAVE_LIBJIT */