#ifdef HAVE_CONFIG_H
# include "config.h"
+#else
+# include "php_config.h"
#endif
#include "php.h"
#ifdef HAVE_LIBFFI
#include "php_psi.h"
-#include "libffi.h"
#include "engine.h"
#undef PACKAGE
}
return *code;
#else
- return NULL;
+# error "Neither ffi_closure_alloc() nor mmap() available"
#endif
}
+static ffi_status psi_ffi_prep_closure(ffi_closure **closure, void **code, ffi_cif *sig, void (*handler)(ffi_cif*,void*,void**,void*), void *data) {
+ *closure = psi_ffi_closure_alloc(sizeof(ffi_closure), code);
+ ZEND_ASSERT(*closure != NULL);
+
+#if PSI_HAVE_FFI_PREP_CLOSURE_LOC
+ return ffi_prep_closure_loc(*closure, sig, handler, data, *code);
+
+#elif PSI_HAVE_FFI_PREP_CLOSURE
+ return ffi_prep_closure(*code, sig, handler, data);
+#else
+# error "Neither ffi_prep_closure() nor ffi_prep_closure_loc() is available"
+#endif
+
+}
+
static void psi_ffi_closure_free(void *c)
{
#ifdef PSI_HAVE_FFI_CLOSURE_ALLOC
#endif
}
-static void psi_ffi_handler(ffi_cif *signature, void *_result, void **_args, void *_data);
+static void psi_ffi_handler(ffi_cif *_sig, void *_result, void **_args, void *_data)
+{
+ psi_call(*(zend_execute_data **)_args[0], *(zval **)_args[1], _data);
+}
+
+static void psi_ffi_callback(ffi_cif *_sig, void *_result, void **_args, void *_data)
+{
+ psi_callback(_data, _result, _sig->nargs, _args);
+}
+
static inline ffi_type *psi_ffi_decl_arg_type(decl_arg *darg);
+struct psi_ffi_context {
+ ffi_cif signature;
+ ffi_type *params[2];
+};
+
+struct psi_ffi_call {
+ void *code;
+ ffi_closure *closure;
+ ffi_cif signature;
+ void *params[1]; /* [type1, type2, NULL, arg1, arg2] ... */
+};
+
static inline ffi_abi psi_ffi_abi(const char *convention) {
return FFI_DEFAULT_ABI;
}
+
+static inline struct psi_ffi_call *psi_ffi_call_alloc(struct psi_context *C, decl *decl) {
+ int rc;
+ size_t i, c = decl->args ? decl->args->count : 0;
+ struct psi_ffi_call *call = calloc(1, sizeof(*call) + 2 * c * sizeof(void *));
+
+ for (i = 0; i < c; ++i) {
+ call->params[i] = psi_ffi_decl_arg_type(decl->args->args[i]);
+ }
+ call->params[c] = NULL;
+
+ decl->call.info = call;
+ decl->call.rval = &decl->func->ptr;
+ decl->call.argc = c;
+ decl->call.args = (void **) &call->params[c+1];
+
+ rc = ffi_prep_cif(&call->signature, psi_ffi_abi(decl->abi->convention),
+ c, psi_ffi_decl_arg_type(decl->func), (ffi_type **) call->params);
+ ZEND_ASSERT(FFI_OK == rc);
+
+ return call;
+}
+
+static inline ffi_status psi_ffi_call_init_closure(struct psi_context *C, struct psi_ffi_call *call, impl *impl) {
+ struct psi_ffi_context *context = C->context;
+
+ return psi_ffi_prep_closure(&call->closure, &call->code, &context->signature, psi_ffi_handler, impl);
+}
+
+static inline ffi_status psi_ffi_call_init_callback_closure(struct psi_context *C, struct psi_ffi_call *call, let_callback *cb) {
+ return psi_ffi_prep_closure(&call->closure, &call->code, &call->signature, psi_ffi_callback, cb);
+}
+
+static inline void psi_ffi_call_free(struct psi_ffi_call *call) {
+ if (call->closure) {
+ psi_ffi_closure_free(call->closure);
+ }
+ free(call);
+}
+
static inline ffi_type *psi_ffi_token_type(token_t t) {
switch (t) {
default:
case PSI_T_BOOL:
return &ffi_type_uchar;
case PSI_T_INT:
+ case PSI_T_ENUM:
return &ffi_type_sint;
case PSI_T_LONG:
return &ffi_type_slong;
return &ffi_type_longdouble;
#endif
case PSI_T_POINTER:
+ case PSI_T_FUNCTION:
return &ffi_type_pointer;
}
}
static inline ffi_type *psi_ffi_decl_type(decl_type *type) {
decl_type *real = real_decl_type(type);
- if (real->type == PSI_T_STRUCT) {
- if (!real->strct->engine.type) {
+ switch (real->type) {
+ case PSI_T_STRUCT:
+ if (!real->real.strct->engine.type) {
ffi_type *strct = calloc(1, sizeof(ffi_type));
strct->type = FFI_TYPE_STRUCT;
strct->size = 0;
- strct->elements = psi_ffi_struct_type_elements(real->strct);
+ strct->elements = psi_ffi_struct_type_elements(real->real.strct);
- real->strct->engine.type = strct;
- real->strct->engine.dtor = psi_ffi_struct_type_dtor;
+ real->real.strct->engine.type = strct;
+ real->real.strct->engine.dtor = psi_ffi_struct_type_dtor;
}
- return real->strct->engine.type;
+ return real->real.strct->engine.type;
+
+ case PSI_T_UNION:
+ return psi_ffi_decl_arg_type(real->real.unn->args->args[0]);
+
+ default:
+ return psi_ffi_token_type(real->type);
}
- return psi_ffi_token_type(real->type);
}
static inline ffi_type *psi_ffi_decl_arg_type(decl_arg *darg) {
if (darg->var->pointer_level) {
}
}
-typedef struct PSI_LibffiContext {
- ffi_cif signature;
- ffi_type *params[2];
-} PSI_LibffiContext;
-
-typedef struct PSI_LibffiCall {
- void *code;
- ffi_closure *closure;
- ffi_cif signature;
- void *params[1]; /* [type1, type2, NULL, arg1, arg2] ... */
-} PSI_LibffiCall;
-static inline PSI_LibffiCall *PSI_LibffiCallAlloc(PSI_Context *C, decl *decl) {
- int rc;
- size_t i, c = decl->args ? decl->args->count : 0;
- PSI_LibffiCall *call = calloc(1, sizeof(*call) + 2 * c * sizeof(void *));
-
- for (i = 0; i < c; ++i) {
- call->params[i] = psi_ffi_decl_arg_type(decl->args->args[i]);
- }
- call->params[c] = NULL;
-
- decl->call.info = call;
- decl->call.rval = &decl->func->ptr;
- decl->call.argc = c;
- decl->call.args = (void **) &call->params[c+1];
-
- rc = ffi_prep_cif(&call->signature, psi_ffi_abi(decl->abi->convention),
- c, psi_ffi_decl_arg_type(decl->func), (ffi_type **) call->params);
- ZEND_ASSERT(FFI_OK == rc);
-
- return call;
-}
-
-static inline void PSI_LibffiCallInitClosure(PSI_Context *C, PSI_LibffiCall *call, impl *impl) {
- PSI_LibffiContext *context = C->context;
- int rc;
-
- call->closure = psi_ffi_closure_alloc(sizeof(ffi_closure), &call->code);
- ZEND_ASSERT(call->closure != NULL);
-
-#if PSI_HAVE_FFI_PREP_CLOSURE_LOC
- rc = ffi_prep_closure_loc(
- call->closure,
- &context->signature,
- psi_ffi_handler,
- impl,
- call->code);
-
-#elif PSI_HAVE_FFI_PREP_CLOSURE
- rc = ffi_prep_closure(call->code, &context->signature, psi_ffi_handler, impl);
-#else
-# error "Neither ffi_prep_closure() nor ffi_prep_closure_loc() available"
-#endif
- ZEND_ASSERT(FFI_OK == rc);
-}
-
-static inline void PSI_LibffiCallFree(PSI_LibffiCall *call) {
- if (call->closure) {
- psi_ffi_closure_free(call->closure);
- }
- free(call);
-}
-
-static inline PSI_LibffiContext *PSI_LibffiContextInit(PSI_LibffiContext *L) {
+static inline struct psi_ffi_context *psi_ffi_context_init(struct psi_ffi_context *L) {
ffi_status rc;
if (!L) {
return L;
}
-static void psi_ffi_handler(ffi_cif *_sig, void *_result, void **_args, void *_data)
-{
- psi_call(*(zend_execute_data **)_args[0], *(zval **)_args[1], _data);
+static inline void psi_ffi_context_free(struct psi_ffi_context **L) {
+ if (*L) {
+ free(*L);
+ *L = NULL;
+ }
}
-static void psi_ffi_init(PSI_Context *C)
+static void psi_ffi_init(struct psi_context *C)
{
- C->context = PSI_LibffiContextInit(NULL);
+ C->context = psi_ffi_context_init(NULL);
}
-static void psi_ffi_dtor(PSI_Context *C)
+static inline void psi_ffi_destroy_callbacks(struct psi_context *C, let_val *let_val) {
+ let_callback *cb;
+ let_func *fn = NULL;
+
+ switch (let_val->kind) {
+ case PSI_LET_CALLBACK:
+ cb = let_val->data.callback;
+
+ if (cb->decl && cb->decl->call.info) {
+ psi_ffi_call_free(cb->decl->call.info);
+ }
+ fn = cb->func;
+ /* no break */
+ case PSI_LET_FUNC:
+ if (!fn) {
+ fn = let_val->data.func;
+ }
+
+ if (fn->inner) {
+ size_t i;
+
+ for (i = 0; i < fn->inner->count; ++i) {
+ psi_ffi_destroy_callbacks(C, fn->inner->vals[i]);
+ }
+ }
+ break;
+ default:
+ break;
+ }
+}
+
+static void psi_ffi_dtor(struct psi_context *C)
{
if (C->decls) {
size_t i;
decl *decl = C->decls->list[i];
if (decl->call.info) {
- PSI_LibffiCallFree(decl->call.info);
+ psi_ffi_call_free(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_ffi_call_free(cb->decl->call.info);
+ }
+ }
+ }
+ }
+ }
+ psi_ffi_context_free((void *) &C->context);
+}
+
+static inline void psi_ffi_compile_callbacks(struct psi_context *C, let_val *let_val) {
+ struct psi_ffi_call *call;
+ let_callback *cb;
+ let_func *fn = NULL;
+
+ switch (let_val->kind) {
+ case PSI_LET_CALLBACK:
+ cb = let_val->data.callback;
+ if ((call = psi_ffi_call_alloc(C, cb->decl))) {
+ if (FFI_OK != psi_ffi_call_init_callback_closure(C, call, cb)) {
+ psi_ffi_call_free(call);
+ break;
+ }
+
+ cb->decl->call.sym = call->code;
+ }
+ fn = cb->func;
+ /* no break */
+ case PSI_LET_FUNC:
+ if (!fn) {
+ fn = let_val->data.func;
+ }
+ if (fn->inner) {
+ size_t i;
+
+ for (i = 0; i < fn->inner->count; ++i) {
+ psi_ffi_compile_callbacks(C, fn->inner->vals[i]);
+ }
+ }
+ break;
+ default:
+ break;
}
- free(C->context);
}
-static zend_function_entry *psi_ffi_compile(PSI_Context *C)
+static zend_function_entry *psi_ffi_compile(struct psi_context *C)
{
- size_t i, j = 0;
+ size_t c, i, j = 0;
zend_function_entry *zfe;
if (!C->impls) {
zfe = calloc(C->impls->count + 1, sizeof(*zfe));
for (i = 0; i < C->impls->count; ++i) {
zend_function_entry *zf = &zfe[j];
- PSI_LibffiCall *call;
+ struct psi_ffi_call *call;
impl *impl = C->impls->list[i];
if (!impl->decl) {
continue;
}
- call = PSI_LibffiCallAlloc(C, impl->decl);
- PSI_LibffiCallInitClosure(C, call, impl);
+ if ((call = psi_ffi_call_alloc(C, impl->decl))) {
+ if (FFI_OK != psi_ffi_call_init_closure(C, call, impl)) {
+ psi_ffi_call_free(call);
+ continue;
+ }
+ }
zf->fname = impl->func->name + (impl->func->name[0] == '\\');
zf->num_args = impl->func->args->count;
zf->handler = call->code;
zf->arg_info = psi_internal_arginfo(impl);
++j;
+
+ for (c = 0; c < impl->stmts->let.count; ++c) {
+ psi_ffi_compile_callbacks(C, impl->stmts->let.list[c]->val);
+ }
}
for (i = 0; i < C->decls->count; ++i) {
decl *decl = C->decls->list[i];
- if (decl->impl) {
+ if (decl->call.info) {
continue;
}
- PSI_LibffiCallAlloc(C, decl);
+ psi_ffi_call_alloc(C, decl);
}
return zfe;
}
-static void psi_ffi_call(PSI_Context *C, decl_callinfo *decl_call, impl_vararg *va) {
- PSI_LibffiCall *call = decl_call->info;
+static void psi_ffi_call(struct psi_context *C, decl_callinfo *decl_call, impl_vararg *va) {
+ struct psi_ffi_call *call = decl_call->info;
if (va) {
ffi_status rc;
}
}
-static PSI_ContextOps ops = {
+static struct psi_context_ops ops = {
psi_ffi_init,
psi_ffi_dtor,
psi_ffi_compile,
psi_ffi_call,
};
-PSI_ContextOps *PSI_Libffi(void)
+struct psi_context_ops *psi_libffi_ops(void)
{
return &ops;
}