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

diff --git a/src/libffi.c b/src/libffi.c
index eb5b2b5..b0100f6 100644
--- a/src/libffi.c
+++ b/src/libffi.c
@@ -2,6 +2,13 @@
 #include "php_psi.h"
 #include "libffi.h"
 
+#undef PACKAGE
+#undef PACKAGE_BUGREPORT
+#undef PACKAGE_NAME
+#undef PACKAGE_STRING
+#undef PACKAGE_TARNAME
+#undef PACKAGE_VERSION
+
 #include <ffi.h>
 
 #ifndef PSI_HAVE_FFI_CLOSURE_ALLOC
@@ -10,6 +17,9 @@
 # endif
 # if HAVE_SYS_MMAN_H
 #  include <sys/mman.h>
+#  ifndef MAP_ANONYMOUS
+#   define MAP_ANONYMOUS MAP_ANON
+#  endif
 # endif
 #endif
 
@@ -38,7 +48,7 @@ static void psi_ffi_closure_free(void *c)
 #endif
 }
 
-static void handler(ffi_cif *signature, void *_result, void **_args, void *_data);
+static void psi_ffi_handler(ffi_cif *signature, void *_result, void **_args, void *_data);
 
 static inline ffi_abi psi_ffi_abi(const char *convention) {
 	return FFI_DEFAULT_ABI;
@@ -114,7 +124,7 @@ typedef struct PSI_LibffiData {
 
 static inline PSI_LibffiData *PSI_LibffiDataAlloc(PSI_LibffiContext *context, impl *impl) {
 	ffi_status rc;
-	size_t i, c = impl->decl->args->count;
+	size_t i, c = impl->decl->args ? impl->decl->args->count : 0;
 	PSI_LibffiData *data = malloc(sizeof(*data) + c * sizeof(ffi_type *));
 
 	data->context = context;
@@ -139,12 +149,12 @@ static inline PSI_LibffiData *PSI_LibffiDataAlloc(PSI_LibffiContext *context, im
 	rc = ffi_prep_closure_loc(
 			data->closure,
 			&context->signature,
-			handler,
+			psi_ffi_handler,
 			data,
 			data->code);
 	ZEND_ASSERT(FFI_OK == rc);
 #elif PSI_HAVE_FFI_PREP_CLOSURE
-	rc = ffi_prep_closure(data->code, &context->signature, handler, data);
+	rc = ffi_prep_closure(data->code, &context->signature, psi_ffi_handler, data);
 	ZEND_ASSERT(FFI_OK == rc);
 #else
 # error "Neither ffi_prep_closure() nor ffi_prep_closure_loc() available"
@@ -197,28 +207,24 @@ static inline void PSI_LibffiContextFree(PSI_LibffiContext **L) {
 	}
 }
 
-static void handler(ffi_cif *_sig, void *_result, void **_args, void *_data)
+static void psi_ffi_handler(ffi_cif *_sig, void *_result, void **_args, void *_data)
 {
 	PSI_LibffiData *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)) {
 		return;
 	}
 
-	if (data->impl->decl->args->count) {
-		arg_ptr = malloc(data->impl->decl->args->count * sizeof(*arg_ptr));
+	if (data->impl->decl->args) {
 		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);
 		}
 	}
 
@@ -229,7 +235,9 @@ static void handler(ffi_cif *_sig, void *_result, void **_args, void *_data)
 	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->func, set->val->vars);
+		}
 	}
 
 	for (i = 0; i < data->impl->stmts->fre.count; ++i) {
@@ -240,25 +248,22 @@ static void handler(ffi_cif *_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_ffi_init(PSI_Context *C)
 {
 	C->context = PSI_LibffiContextInit(NULL);
 }
 
-static void dtor(PSI_Context *C)
+static void psi_ffi_dtor(PSI_Context *C)
 {
 	PSI_LibffiContextFree((void *) &C->context);
 }
 
-static zend_function_entry *compile(PSI_Context *C, PSI_Data *D)
+static zend_function_entry *psi_ffi_compile(PSI_Context *C, PSI_Data *D)
 {
 	size_t i, j = 0;
 	zend_function_entry *zfe = calloc(D->impls->count + 1, sizeof(*zfe));
@@ -284,9 +289,9 @@ static zend_function_entry *compile(PSI_Context *C, PSI_Data *D)
 }
 
 static PSI_ContextOps ops = {
-	init,
-	dtor,
-	compile,
+	psi_ffi_init,
+	psi_ffi_dtor,
+	psi_ffi_compile,
 };
 
 PSI_ContextOps *PSI_Libffi(void)