X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Flibjit.c;h=62540ccbeb5b891a452ff502ee6cbde8f8c16df0;hb=6b2e6562e64a263a42910d28e23b6ca94f3ecb65;hp=8a766f33ca2a8d59c801e9cd35f28c3ebd8a7923;hpb=8cd572501cde6de9ce74840fe7f749ed076b7eda;p=m6w6%2Fext-psi

diff --git a/src/libjit.c b/src/libjit.c
index 8a766f3..62540cc 100644
--- a/src/libjit.c
+++ b/src/libjit.c
@@ -8,16 +8,30 @@
 
 #include "php_psi.h"
 #include "libjit.h"
+#include "engine.h"
 
 #include <jit/jit.h>
 
-static void psi_jit_handler(jit_type_t _sig, void *result, void **_args, void *_data);
+static void psi_jit_handler(jit_type_t _sig, void *_result, void **_args, void *_data)
+{
+	psi_call(*(zend_execute_data **)_args[0], *(zval **)_args[1], _data);
+}
+
+static void psi_jit_callback(jit_type_t _sig, void *_result, void **_args, void *_data)
+{
+	psi_callback(_data, _result, jit_type_num_params(_sig), _args);
+}
+
+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_token_type(token_t t) {
 	switch (t) {
+	default:
+		ZEND_ASSERT(0);
+		/* no break */
 	case PSI_T_VOID:
 		return jit_type_void;
 	case PSI_T_INT8:
@@ -38,11 +52,22 @@ static inline jit_type_t psi_jit_token_type(token_t t) {
 		return jit_type_ulong;
 	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:
 		return jit_type_sys_double;
-	EMPTY_SWITCH_DEFAULT_CASE();
+#ifdef HAVE_LONG_DOUBLE
+	case PSI_T_LONG_DOUBLE:
+		return jit_type_sys_long_double;
+#endif
+	case PSI_T_POINTER:
+	case PSI_T_FUNCTION:
+		return jit_type_void_ptr;
 	}
 }
 static inline jit_type_t psi_jit_impl_type(token_t impl_type) {
@@ -58,9 +83,89 @@ static inline jit_type_t psi_jit_impl_type(token_t impl_type) {
 		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, 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_token_type(real_decl_type(type)->type);
+	decl_type *real = real_decl_type(type);
+
+	switch (real->type) {
+	case PSI_T_STRUCT:
+		if (!real->real.strct->engine.type) {
+			unsigned count;
+			jit_type_t strct, *fields = NULL;
+
+			count = psi_jit_struct_type_elements(real->real.strct, &fields);
+			strct = jit_type_create_struct(fields, count, 0);
+
+			real->real.strct->engine.type = strct;
+			real->real.strct->engine.dtor = psi_jit_struct_type_dtor;
+		}
+
+		return real->real.strct->engine.type;
+
+	case PSI_T_UNION:
+		return psi_jit_decl_arg_type(real->real.unn->args->args[0]);
+
+	default:
+		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) {
@@ -101,7 +206,7 @@ static inline PSI_LibjitCall *PSI_LibjitCallAlloc(PSI_Context *C, decl *decl) {
 	call->params[c] = NULL;
 
 	decl->call.info = call;
-	decl->call.rval = decl->func->ptr;
+	decl->call.rval = &decl->func->ptr;
 	decl->call.argc = c;
 	decl->call.args = (void **) &call->params[c+1];
 
@@ -109,15 +214,23 @@ static inline PSI_LibjitCall *PSI_LibjitCallAlloc(PSI_Context *C, decl *decl) {
 			psi_jit_abi(decl->abi->convention),
 			psi_jit_decl_arg_type(decl->func),
 			(jit_type_t *) call->params, c, 1);
+	ZEND_ASSERT(call->signature);
+
 	return call;
 }
 
-static inline void PSI_LibjitCallInitClosure(PSI_Context *C, PSI_LibjitCall *call, impl *impl) {
+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,
+	return call->closure = jit_closure_create(context->jit, context->signature,
 			&psi_jit_handler, impl);
 }
 
+static inline void *PSI_LibjitCallInitCallbackClosure(PSI_Context *C, PSI_LibjitCall *call, let_callback *cb) {
+	PSI_LibjitContext *context = C->context;
+	return call->closure = jit_closure_create(context->jit, call->signature,
+			&psi_jit_callback, cb);
+}
+
 static inline void PSI_LibjitCallFree(PSI_LibjitCall *call) {
 	jit_type_free(call->signature);
 	free(call);
@@ -154,11 +267,6 @@ static inline void PSI_LibjitContextFree(PSI_LibjitContext **L) {
 	}
 }
 
-static void psi_jit_handler(jit_type_t _sig, void *result, void **_args, void *_data)
-{
-	psi_call(*(zend_execute_data **)_args[0], *(zval **)_args[1], _data);
-}
-
 static void psi_jit_init(PSI_Context *C)
 {
 	C->context = PSI_LibjitContextInit(NULL);
@@ -172,7 +280,28 @@ static void psi_jit_dtor(PSI_Context *C)
 		for (i = 0; i < C->decls->count; ++i) {
 			decl *decl = C->decls->list[i];
 
-			PSI_LibjitCallFree(decl->call.info);
+			if (decl->call.info) {
+				PSI_LibjitCallFree(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_LibjitCallFree(cb->decl->call.info);
+					}
+				}
+			}
 		}
 	}
 	PSI_LibjitContextFree((void *) &C->context);
@@ -180,7 +309,7 @@ static void psi_jit_dtor(PSI_Context *C)
 
 static zend_function_entry *psi_jit_compile(PSI_Context *C)
 {
-	size_t i, j = 0;
+	size_t c, i, j = 0;
 	zend_function_entry *zfe;
 	PSI_LibjitContext *ctx = C->context;
 
@@ -200,20 +329,41 @@ static zend_function_entry *psi_jit_compile(PSI_Context *C)
 			continue;
 		}
 
-		call = PSI_LibjitCallAlloc(C, impl->decl);
-		PSI_LibjitCallInitClosure(C, call, impl);
+		if ((call = PSI_LibjitCallAlloc(C, impl->decl))) {
+			if (!PSI_LibjitCallInitClosure(C, call, impl)) {
+				PSI_LibjitCallFree(call);
+				continue;
+			}
+		}
 
 		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 (c = 0; c < impl->stmts->let.count; ++c) {
+			let_stmt *let = impl->stmts->let.list[c];
+
+			if (let->val && let->val->kind == PSI_LET_CALLBACK) {
+				let_callback *cb = let->val->data.callback;
+
+				if ((call = PSI_LibjitCallAlloc(C, cb->decl))) {
+					if (!PSI_LibjitCallInitCallbackClosure(C, call, cb)) {
+						PSI_LibjitCallFree(call);
+						continue;
+					}
+
+					cb->decl->call.sym = call->closure;
+				}
+			}
+		}
 	}
 
 	for (i = 0; i < C->decls->count; ++i) {
 		decl *decl = C->decls->list[i];
 
-		if (decl->impl) {
+		if (decl->call.info) {
 			continue;
 		}
 
@@ -249,12 +399,12 @@ static void psi_jit_call(PSI_Context *C, decl_callinfo *decl_call, impl_vararg *
 		ZEND_ASSERT(signature);
 
 		jit_apply(signature, decl_call->sym, &params[ntotalargs + 1],
-						nfixedargs, decl_call->rval);
+						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);
+				decl_call->argc, *decl_call->rval);
 	}
 }