X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Flibjit.c;h=ee9b1f341bb7d5380f4fb069d711f4ee74702b76;hp=98ce029fbcee390ed5d0ac4c04e900cebdd0451c;hb=d9a7378b795f32b91e110bd163c019aa30e79084;hpb=7e5e4c6d2b654cfd3737c37e9e1894be43642721

diff --git a/src/libjit.c b/src/libjit.c
index 98ce029..ee9b1f3 100644
--- a/src/libjit.c
+++ b/src/libjit.c
@@ -4,7 +4,7 @@
 
 #include <jit/jit.h>
 
-static void 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);
 
 static inline jit_abi_t psi_jit_abi(const char *convention) {
 	return jit_abi_cdecl;
@@ -16,32 +16,26 @@ static inline jit_type_t psi_jit_type(token_t t) {
 		/* no break */
 	case PSI_T_VOID:
 		return jit_type_void;
-	case PSI_T_SINT8:
+	case PSI_T_INT8:
 		return jit_type_sbyte;
 	case PSI_T_UINT8:
 		return jit_type_ubyte;
-	case PSI_T_SINT16:
+	case PSI_T_INT16:
 		return jit_type_short;
 	case PSI_T_UINT16:
 		return jit_type_ushort;
-	case PSI_T_SINT32:
+	case PSI_T_INT32:
 		return jit_type_int;
 	case PSI_T_UINT32:
 		return jit_type_uint;
-	case PSI_T_SINT64:
+	case PSI_T_INT64:
 		return jit_type_long;
 	case PSI_T_UINT64:
 		return jit_type_ulong;
 	case PSI_T_BOOL:
 		return jit_type_sys_bool;
-	case PSI_T_CHAR:
-		return jit_type_sys_char;
-	case PSI_T_SHORT:
-		return jit_type_sys_short;
 	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:
@@ -94,7 +88,7 @@ static inline PSI_LibjitData *PSI_LibjitDataAlloc(PSI_LibjitContext *context, im
 		data->params,
 		data->impl->decl->args->count,
 		1);
-	data->closure = jit_closure_create(context->jit, context->signature, &handler, data);
+	data->closure = jit_closure_create(context->jit, context->signature, &psi_jit_handler, data);
 
 	context->data.list = realloc(context->data.list, ++context->data.count * sizeof(*context->data.list));
 	context->data.list[context->data.count-1] = data;
@@ -146,11 +140,11 @@ static inline void PSI_LibjitContextFree(PSI_LibjitContext **L) {
 	}
 }
 
-static void 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_LibjitData *data = _data;
 	size_t i;
-	void **arg_ptr = NULL, **arg_prm = NULL;
+	void **arg_prm = NULL;
 	impl_val ret_val;
 
 	if (SUCCESS != psi_parse_args(*(zend_execute_data **)_args[0], data->impl)) {
@@ -158,27 +152,25 @@ static void handler(jit_type_t _sig, void *result, void **_args, void *_data)
 	}
 
 	if (data->impl->decl->args->count) {
-		arg_ptr = malloc(data->impl->decl->args->count * sizeof(*arg_ptr));
 		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_ptr[i] = psi_do_let(darg);
-			arg_prm[i] = darg->let->val->is_reference ? &arg_ptr[i] : arg_ptr[i];
-
-			darg->let->ptr = arg_ptr[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(data->impl, &ret_val, *(zval **)_args[1]);
+	psi_do_return(data->impl->stmts->ret.list[0], &ret_val, *(zval **)_args[1]);
 
 	for (i = 0; i < data->impl->stmts->set.count; ++i) {
 		set_stmt *set = data->impl->stmts->set.list[i];
 
-		psi_do_set(set->arg->_zv, set->val->func, set->val->vars);
+		if (set->arg->_zv) {
+			psi_do_set(set->arg->_zv, set->val);
+		}
 	}
 
 	for (i = 0; i < data->impl->stmts->fre.count; ++i) {
@@ -189,43 +181,45 @@ static void handler(jit_type_t _sig, void *result, void **_args, void *_data)
 
 	psi_do_clean(data->impl);
 
-	if (arg_ptr) {
-		free(arg_ptr);
-	}
 	if (arg_prm) {
 		free(arg_prm);
 	}
 }
 
-static void init(PSI_Context *C)
+static void psi_jit_init(PSI_Context *C)
 {
 	C->context = PSI_LibjitContextInit(NULL);
 }
 
-static void dtor(PSI_Context *C)
+static void psi_jit_dtor(PSI_Context *C)
 {
 	PSI_LibjitContextFree((void *) &C->context);
 }
 
-static zend_function_entry *compile(PSI_Context *C, PSI_Data *D)
+static zend_function_entry *psi_jit_compile(PSI_Context *C)
 {
 	size_t i, j = 0;
-	zend_function_entry *zfe = calloc(D->impls->count + 1, sizeof(*zfe));
+	zend_function_entry *zfe;
 	PSI_LibjitContext *ctx = C->context;
 
+	if (!C->impls) {
+		return NULL;
+	}
+
+	zfe = calloc(C->impls->count + 1, sizeof(*zfe));
 	jit_context_build_start(ctx->jit);
 
-	for (i = 0; i < D->impls->count; ++i) {
+	for (i = 0; i < C->impls->count; ++i) {
 		zend_function_entry *zf = &zfe[j];
 		PSI_LibjitData *data;
 
-		if (!D->impls->list[i]->decl) {
+		if (!C->impls->list[i]->decl) {
 			continue;
 		}
 
-		data = PSI_LibjitDataAlloc(ctx, D->impls->list[i]);
-		zf->fname = D->impls->list[i]->func->name + (D->impls->list[i]->func->name[0] == '\\');
-		zf->num_args = D->impls->list[i]->func->args->count;
+		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;
 		++j;
@@ -237,9 +231,9 @@ static zend_function_entry *compile(PSI_Context *C, PSI_Data *D)
 }
 
 static PSI_ContextOps ops = {
-	init,
-	dtor,
-	compile,
+	psi_jit_init,
+	psi_jit_dtor,
+	psi_jit_compile,
 };
 
 PSI_ContextOps *PSI_Libjit(void)