#ifdef HAVE_CONFIG_H
# include "config.h"
+#else
+# include "php_config.h"
#endif
#include "php.h"
#include "php_psi.h"
#include "libjit.h"
+#include "engine.h"
#include <jit/jit.h>
-static void psi_jit_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_call(*(zend_execute_data **)_args[0], *(zval **)_args[1], _data);
+}
+
+static void psi_jit_callback(jit_type_t _sig, void *_result, void **_args, void *_data)
+{
+ psi_callback(_data, _result, jit_type_num_params(_sig), _args);
+}
+
static inline jit_type_t psi_jit_decl_arg_type(decl_arg *darg);
static inline jit_abi_t psi_jit_abi(const char *convention) {
case PSI_T_BOOL:
return jit_type_sys_bool;
case PSI_T_INT:
+ case PSI_T_ENUM:
return jit_type_sys_int;
case PSI_T_LONG:
return jit_type_sys_long;
return jit_type_sys_long_double;
#endif
case PSI_T_POINTER:
+ case PSI_T_FUNCTION:
return jit_type_void_ptr;
}
}
static inline jit_type_t psi_jit_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) {
unsigned count;
jit_type_t strct, *fields = NULL;
- count = psi_jit_struct_type_elements(real->strct, &fields);
+ count = psi_jit_struct_type_elements(real->real.strct, &fields);
strct = jit_type_create_struct(fields, count, 0);
- real->strct->engine.type = strct;
- real->strct->engine.dtor = psi_jit_struct_type_dtor;
+ real->real.strct->engine.type = strct;
+ real->real.strct->engine.dtor = psi_jit_struct_type_dtor;
}
- return real->strct->engine.type;
+ return real->real.strct->engine.type;
+
+ case PSI_T_UNION:
+ return psi_jit_decl_arg_type(real->real.unn->args->args[0]);
+
+ default:
+ return psi_jit_token_type(real->type);
}
- return psi_jit_token_type(real->type);
}
static inline jit_type_t psi_jit_decl_arg_type(decl_arg *darg) {
if (darg->var->pointer_level) {
}
}
-typedef struct PSI_LibjitContext {
+struct psi_jit_context {
jit_context_t jit;
jit_type_t signature;
struct {
- struct PSI_LibjitData **list;
+ struct psi_jit_data **list;
size_t count;
} data;
-} PSI_LibjitContext;
+};
-typedef struct PSI_LibjitCall {
+struct psi_jit_call {
void *closure;
jit_type_t signature;
void *params[1]; /* [type1, type2, NULL, arg1, arg2] ... */
-} PSI_LibjitCall;
+};
-typedef struct PSI_LibjitData {
- PSI_LibjitContext *context;
+struct psi_jit_data {
+ struct psi_jit_context *context;
impl *impl;
zend_internal_arg_info *arginfo;
-} PSI_LibjitData;
+};
-static inline PSI_LibjitCall *PSI_LibjitCallAlloc(PSI_Context *C, decl *decl) {
+static inline struct psi_jit_call *psi_jit_call_alloc(struct psi_context *C, decl *decl) {
size_t i, c = decl->args ? decl->args->count : 0;
- PSI_LibjitCall *call = calloc(1, sizeof(*call) + 2 * c * sizeof(void *));
+ struct psi_jit_call *call = calloc(1, sizeof(*call) + 2 * c * sizeof(void *));
for (i = 0; i < c; ++i) {
call->params[i] = psi_jit_decl_arg_type(decl->args->args[i]);
psi_jit_abi(decl->abi->convention),
psi_jit_decl_arg_type(decl->func),
(jit_type_t *) call->params, c, 1);
+ ZEND_ASSERT(call->signature);
+
return call;
}
-static inline void PSI_LibjitCallInitClosure(PSI_Context *C, PSI_LibjitCall *call, impl *impl) {
- PSI_LibjitContext *context = C->context;
- call->closure = jit_closure_create(context->jit, context->signature,
+static inline void *psi_jit_call_init_closure(struct psi_context *C, struct psi_jit_call *call, impl *impl) {
+ struct psi_jit_context *context = C->context;
+ return call->closure = jit_closure_create(context->jit, context->signature,
&psi_jit_handler, impl);
}
-static inline void PSI_LibjitCallFree(PSI_LibjitCall *call) {
+static inline void *psi_jit_call_init_callback_closure(struct psi_context *C, struct psi_jit_call *call, let_callback *cb) {
+ struct psi_jit_context *context = C->context;
+ return call->closure = jit_closure_create(context->jit, call->signature,
+ &psi_jit_callback, cb);
+}
+
+static inline void psi_jit_call_free(struct psi_jit_call *call) {
jit_type_free(call->signature);
free(call);
}
-static inline PSI_LibjitContext *PSI_LibjitContextInit(PSI_LibjitContext *L) {
+static inline struct psi_jit_context *psi_jit_context_init(struct psi_jit_context *L) {
jit_type_t params[] = {
jit_type_void_ptr,
jit_type_void_ptr
return L;
}
-static inline void PSI_LibjitContextDtor(PSI_LibjitContext *L) {
+static inline void psi_jit_context_dtor(struct psi_jit_context *L) {
jit_type_free(L->signature);
jit_context_destroy(L->jit);
}
-static inline void PSI_LibjitContextFree(PSI_LibjitContext **L) {
+static inline void psi_jit_context_free(struct psi_jit_context **L) {
if (*L) {
- PSI_LibjitContextDtor(*L);
+ psi_jit_context_dtor(*L);
free(*L);
*L = NULL;
}
}
-static void psi_jit_handler(jit_type_t _sig, void *result, void **_args, void *_data)
+static void psi_jit_init(struct psi_context *C)
{
- psi_call(*(zend_execute_data **)_args[0], *(zval **)_args[1], _data);
+ C->context = psi_jit_context_init(NULL);
}
-static void psi_jit_init(PSI_Context *C)
-{
- C->context = PSI_LibjitContextInit(NULL);
+static inline void psi_jit_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_jit_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_jit_destroy_callbacks(C, fn->inner->vals[i]);
+ }
+ }
+ break;
+ default:
+ break;
+ }
}
-static void psi_jit_dtor(PSI_Context *C)
+static void psi_jit_dtor(struct psi_context *C)
{
if (C->decls) {
size_t i;
for (i = 0; i < C->decls->count; ++i) {
decl *decl = C->decls->list[i];
- PSI_LibjitCallFree(decl->call.info);
+ if (decl->call.info) {
+ psi_jit_call_free(decl->call.info);
+ }
}
}
- PSI_LibjitContextFree((void *) &C->context);
+ 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) {
+ psi_jit_destroy_callbacks(C, impl->stmts->let.list[j]->val);
+ }
+ }
+ }
+ psi_jit_context_free((void *) &C->context);
}
-static zend_function_entry *psi_jit_compile(PSI_Context *C)
+static inline void psi_jit_compile_callbacks(struct psi_context *C, let_val *let_val) {
+ struct psi_jit_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_jit_call_alloc(C, cb->decl))) {
+ if (!psi_jit_call_init_callback_closure(C, call, cb)) {
+ psi_jit_call_free(call);
+ break;
+ }
+
+ cb->decl->call.sym = call->closure;
+ }
+ 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_jit_compile_callbacks(C, fn->inner->vals[i]);
+ }
+ }
+ break;
+ default:
+ break;
+ }
+}
+
+static zend_function_entry *psi_jit_compile(struct psi_context *C)
{
- size_t i, j = 0;
+ size_t c, i, j = 0;
zend_function_entry *zfe;
- PSI_LibjitContext *ctx = C->context;
+ struct psi_jit_context *ctx = C->context;
if (!C->impls) {
return NULL;
for (i = 0; i < C->impls->count; ++i) {
zend_function_entry *zf = &zfe[j];
- PSI_LibjitCall *call;
+ struct psi_jit_call *call;
impl *impl = C->impls->list[i];
if (!impl->decl) {
continue;
}
- call = PSI_LibjitCallAlloc(C, impl->decl);
- PSI_LibjitCallInitClosure(C, call, impl);
+ if ((call = psi_jit_call_alloc(C, impl->decl))) {
+ if (!psi_jit_call_init_closure(C, call, impl)) {
+ psi_jit_call_free(call);
+ continue;
+ }
+ }
zf->fname = impl->func->name + (impl->func->name[0] == '\\');
zf->num_args = impl->func->args->count;
zf->handler = call->closure;
zf->arg_info = psi_internal_arginfo(impl);
++j;
+
+ for (c = 0; c < impl->stmts->let.count; ++c) {
+ psi_jit_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_LibjitCallAlloc(C, decl);
+ psi_jit_call_alloc(C, decl);
}
jit_context_build_end(ctx->jit);
return zfe;
}
-static void psi_jit_call(PSI_Context *C, decl_callinfo *decl_call, impl_vararg *va) {
- PSI_LibjitCall *call = decl_call->info;
+static void psi_jit_call(struct psi_context *C, decl_callinfo *decl_call, impl_vararg *va) {
+ struct psi_jit_call *call = decl_call->info;
if (va) {
jit_type_t signature;
}
}
-static PSI_ContextOps ops = {
+static struct psi_context_ops ops = {
psi_jit_init,
psi_jit_dtor,
psi_jit_compile,
psi_jit_call,
};
-PSI_ContextOps *PSI_Libjit(void)
+struct psi_context_ops *psi_libjit_ops(void)
{
return &ops;
}
projects / m6w6 / ext-psi / blobdiff