X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Flibjit.c;h=f4f57c538018a8007ed9c54ae824779e2a79e68f;hp=fd68c5089af636202d537c2cf76b858a69939b1c;hb=3c53642a0adccd4b602d147833da24eb4b73bccc;hpb=7474b3e23338ea03bcd65551959e2582cc455f9f

diff --git a/src/libjit.c b/src/libjit.c
index fd68c50..f4f57c5 100644
--- a/src/libjit.c
+++ b/src/libjit.c
@@ -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:
@@ -169,13 +163,13 @@ static void psi_jit_handler(jit_type_t _sig, void *result, void **_args, void *_
 
 	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(*(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->func, set->val->vars);
+			psi_do_set(set->arg->_zv, set->val);
 		}
 	}
 
@@ -202,25 +196,30 @@ static void psi_jit_dtor(PSI_Context *C)
 	PSI_LibjitContextFree((void *) &C->context);
 }
 
-static zend_function_entry *psi_jit_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;