X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Flibffi.c;h=f1d72829ae5c231d7d88c628bdebf5272a0dc39a;hb=55ba09956ec121467a269a4a968da5fe45388c1e;hp=b0100f61d96b47763700d1cbf0d06609119899b4;hpb=7474b3e23338ea03bcd65551959e2582cc455f9f;p=m6w6%2Fext-psi

diff --git a/src/libffi.c b/src/libffi.c
index b0100f6..f1d7282 100644
--- a/src/libffi.c
+++ b/src/libffi.c
@@ -60,32 +60,26 @@ static inline ffi_type *psi_ffi_type(token_t t) {
 		/* no break */
 	case PSI_T_VOID:
 		return &ffi_type_void;
-	case PSI_T_SINT8:
+	case PSI_T_INT8:
 		return &ffi_type_sint8;
 	case PSI_T_UINT8:
 		return &ffi_type_uint8;
-	case PSI_T_SINT16:
+	case PSI_T_INT16:
 		return &ffi_type_sint16;
 	case PSI_T_UINT16:
 		return &ffi_type_uint16;
-	case PSI_T_SINT32:
+	case PSI_T_INT32:
 		return &ffi_type_sint32;
 	case PSI_T_UINT32:
 		return &ffi_type_uint32;
-	case PSI_T_SINT64:
+	case PSI_T_INT64:
 		return &ffi_type_sint64;
 	case PSI_T_UINT64:
 		return &ffi_type_uint64;
 	case PSI_T_BOOL:
 		return &ffi_type_uchar;
-	case PSI_T_CHAR:
-		return &ffi_type_schar;
-	case PSI_T_SHORT:
-		return &ffi_type_sshort;
 	case PSI_T_INT:
 		return &ffi_type_sint;
-	case PSI_T_LONG:
-		return &ffi_type_slong;
 	case PSI_T_FLOAT:
 		return &ffi_type_float;
 	case PSI_T_DOUBLE:
@@ -230,13 +224,13 @@ static void psi_ffi_handler(ffi_cif *_sig, void *_result, void **_args, void *_d
 
 	ffi_call(&data->signature, FFI_FN(data->impl->decl->dlptr), &ret_val, arg_prm);
 
-	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);
 		}
 	}
 
@@ -263,23 +257,28 @@ static void psi_ffi_dtor(PSI_Context *C)
 	PSI_LibffiContextFree((void *) &C->context);
 }
 
-static zend_function_entry *psi_ffi_compile(PSI_Context *C, PSI_Data *D)
+static zend_function_entry *psi_ffi_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_LibffiContext *ctx = C->context;
 
-	for (i = 0; i < D->impls->count; ++i) {
+	if (!C->impls) {
+		return NULL;
+	}
+
+	zfe = calloc(C->impls->count + 1, sizeof(*zfe));
+	for (i = 0; i < C->impls->count; ++i) {
 		zend_function_entry *zf = &zfe[j];
 		PSI_LibffiData *data;
 
-		if (!D->impls->list[i]->decl) {
+		if (!C->impls->list[i]->decl) {
 			continue;
 		}
 
-		data = PSI_LibffiDataAlloc(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_LibffiDataAlloc(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->code;
 		zf->arg_info = data->arginfo;
 		++j;
@@ -288,10 +287,36 @@ static zend_function_entry *psi_ffi_compile(PSI_Context *C, PSI_Data *D)
 	return zfe;
 }
 
+static void psi_ffi_call(PSI_Context *C, impl_val *ret_val, decl *decl, impl_val **args) {
+	ffi_cif signature;
+	ffi_type **types;
+	void **argps;
+	size_t i;
+
+	/* FIXME: cache in decl */
+
+	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];
+
+		types[i] = psi_ffi_decl_arg_type(darg);
+		argps[i] = args[i];
+	}
+
+	ffi_prep_cif(&signature, psi_ffi_abi(decl->abi->convention), decl->args->count,
+			psi_ffi_decl_arg_type(decl->func), types);
+	ffi_call(&signature, FFI_FN(decl->dlptr), ret_val, argps);
+
+	free(types);
+	free(argps);
+}
+
 static PSI_ContextOps ops = {
 	psi_ffi_init,
 	psi_ffi_dtor,
 	psi_ffi_compile,
+	psi_ffi_call,
 };
 
 PSI_ContextOps *PSI_Libffi(void)