travis trusty
[m6w6/ext-psi] / src / libjit.c
index 5c4a7b9313c1f4cebcebc15234264ce666561c87..f99c0390f5932b54f69808aa4f21c5e4ddbe065d 100644 (file)
@@ -1,74 +1,61 @@
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#else
+# include "php_config.h"
+#endif
+
 #include "php.h"
+
+#ifdef HAVE_LIBJIT
+
+#include "php_psi.h"
 #include "libjit.h"
-#include "parser_proc.h"
+#include "engine.h"
 
-static void init(PSI_Context *C)
-{
-       C->opaque = jit_context_create();
-}
+#include <jit/jit.h>
 
-static void dtor(PSI_Context *C)
+static void psi_jit_handler(jit_type_t _sig, void *_result, void **_args, void *_data)
 {
-       jit_context_destroy(C->opaque);
+       psi_call(*(zend_execute_data **)_args[0], *(zval **)_args[1], _data);
 }
 
-typedef struct PSI_ClosureData {
-       void *context;
-       impl *impl;
-       jit_type_t signature;
-       zval return_value;
-} PSI_ClosureData;
-
-static inline PSI_ClosureData *PSI_ClosureDataAlloc(void *context, impl *impl) {
-       PSI_ClosureData *data = malloc(sizeof(*data));
-
-       data->context = context;
-       data->impl = impl;
-
-       return 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 size_t impl_num_min_args(impl *impl) {
-       size_t i, n = impl->func->args->count;
-
-       for (i = 0; i < impl->func->args->count; ++i) {
-               if (impl->func->args->args[i]->def) {
-                       --n;
-               }
-       }
-       return n;
-}
+static inline jit_type_t psi_jit_decl_arg_type(decl_arg *darg);
 
 static inline jit_abi_t psi_jit_abi(const char *convention) {
        return jit_abi_cdecl;
 }
-static inline jit_type_t psi_jit_type(token_t t) {
+static inline jit_type_t psi_jit_token_type(token_t t) {
        switch (t) {
+       default:
+               ZEND_ASSERT(0);
+               /* 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:
+       case PSI_T_ENUM:
                return jit_type_sys_int;
        case PSI_T_LONG:
                return jit_type_sys_long;
@@ -76,12 +63,111 @@ static inline jit_type_t psi_jit_type(token_t t) {
                return jit_type_sys_float;
        case PSI_T_DOUBLE:
                return jit_type_sys_double;
-       default:
-               abort();
+#ifdef HAVE_LONG_DOUBLE
+       case PSI_T_LONG_DOUBLE:
+               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_impl_type(token_t impl_type) {
+       switch (impl_type) {
+       case PSI_T_BOOL:
+               return jit_type_sbyte;
+       case PSI_T_INT:
+               return jit_type_long;
+       case PSI_T_STRING:
+               return jit_type_void_ptr;
+       case PSI_T_FLOAT:
+       case PSI_T_DOUBLE:
+               return jit_type_sys_double;
+       EMPTY_SWITCH_DEFAULT_CASE();
+       }
+       return NULL;
+}
+
+static void psi_jit_struct_type_dtor(void *type) {
+       jit_type_t strct = type;
+
+       jit_type_free(strct);
+}
+
+static size_t psi_jit_struct_type_pad(jit_type_t *els, size_t padding) {
+       size_t i;
+
+       for (i = 0; i < padding; ++i) {
+               *els++ = jit_type_copy(jit_type_sys_char);
+       }
+
+       return padding;
+}
+
+static unsigned psi_jit_struct_type_elements(decl_struct *strct, jit_type_t **fields) {
+       size_t i, argc = strct->args->count, nels = 0, offset = 0, maxalign;
+       *fields = calloc(argc + 1, sizeof(*fields));
+
+       for (i = 0; i < strct->args->count; ++i) {
+               decl_arg *darg = strct->args->args[i];
+               jit_type_t type = jit_type_copy(psi_jit_decl_arg_type(darg));
+               size_t padding, alignment;
+
+               ZEND_ASSERT(jit_type_get_size(type) == darg->layout->len);
+
+               if ((alignment = jit_type_get_alignment(type)) > maxalign) {
+                       maxalign = alignment;
+               }
+
+               if ((padding = psi_offset_padding(darg->layout->pos - offset, alignment))) {
+                       if (nels + padding > argc) {
+                               argc += padding;
+                               *fields = realloc(*fields, (argc + 1) * sizeof(*fields));
+                       }
+                       psi_jit_struct_type_pad(&(*fields)[nels], padding);
+                       nels += padding;
+                       offset += padding;
+               }
+               ZEND_ASSERT(offset == darg->layout->pos);
+
+               offset = (offset + darg->layout->len + alignment - 1) & ~(alignment - 1);
+               (*fields)[nels++] = type;
+       }
+
+       /* apply struct alignment padding */
+       offset = (offset + maxalign - 1) & ~(maxalign - 1);
+
+       ZEND_ASSERT(offset <= strct->size);
+       if (offset < strct->size) {
+               nels += psi_jit_struct_type_pad(&(*fields)[nels], strct->size - offset);
        }
+
+       return nels;
 }
 static inline jit_type_t psi_jit_decl_type(decl_type *type) {
-       return psi_jit_type(real_decl_type(type)->type);
+       decl_type *real = real_decl_type(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->real.strct, &fields);
+                       strct = jit_type_create_struct(fields, count, 0);
+
+                       real->real.strct->engine.type = strct;
+                       real->real.strct->engine.dtor = psi_jit_struct_type_dtor;
+               }
+
+               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);
+       }
 }
 static inline jit_type_t psi_jit_decl_arg_type(decl_arg *darg) {
        if (darg->var->pointer_level) {
@@ -90,171 +176,295 @@ static inline jit_type_t psi_jit_decl_arg_type(decl_arg *darg) {
                return psi_jit_decl_type(darg->type);
        }
 }
-static void handler(jit_type_t _sig, void *result, void **_args, void *_data)
+
+struct psi_jit_context {
+       jit_context_t jit;
+       jit_type_t signature;
+       struct {
+               struct psi_jit_data **list;
+               size_t count;
+       } data;
+};
+
+struct psi_jit_call {
+       void *closure;
+       jit_type_t signature;
+       void *params[1]; /* [type1, type2, NULL, arg1, arg2] ... */
+};
+
+struct psi_jit_data {
+       struct psi_jit_context *context;
+       impl *impl;
+       zend_internal_arg_info *arginfo;
+};
+
+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;
+       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]);
+       }
+       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];
+
+       call->signature = jit_type_create_signature(
+                       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_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_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 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
+       };
+
+       if (!L) {
+               L = malloc(sizeof(*L));
+       }
+       memset(L, 0, sizeof(*L));
+
+       L->jit = jit_context_create();
+       L->signature = jit_type_create_signature(jit_abi_cdecl, jit_type_void,
+                       params, 2, 1);
+
+       return 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_jit_context_free(struct psi_jit_context **L) {
+       if (*L) {
+               psi_jit_context_dtor(*L);
+               free(*L);
+               *L = NULL;
+       }
+}
+
+static void psi_jit_init(struct psi_context *C)
 {
-       zend_execute_data *execute_data = *(zend_execute_data **)_args[0];
-       zval *return_value = *(zval **)_args[1];
-       PSI_ClosureData *data = _data;
-       impl_arg *iarg;
-       size_t i;
-       void **arg_ptr = NULL, **arg_prm = NULL;
-       impl_val ret_val, *arg_val = NULL;
-       jit_type_t signature, *sig_prm;
+       C->context = psi_jit_context_init(NULL);
+}
 
-       if (!data->impl->func->args->count) {
-               if (SUCCESS != zend_parse_parameters_none()) {
-                       return;
+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);
                }
-       } else
-       ZEND_PARSE_PARAMETERS_START(impl_num_min_args(data->impl), data->impl->func->args->count)
-       nextarg:
-               iarg = data->impl->func->args->args[_i];
-               if (iarg->def) {
-                       Z_PARAM_OPTIONAL;
+               fn = cb->func;
+               /* no break */
+       case PSI_LET_FUNC:
+               if (!fn) {
+                       fn = let_val->data.func;
                }
-               if (PSI_T_BOOL == iarg->type->type) {
-                       if (iarg->def) {
-                               iarg->val.bval = iarg->def->type == PSI_T_TRUE ? 1 : 0;
-                       }
-                       Z_PARAM_BOOL(iarg->val.bval);
-               } else if (PSI_T_INT == iarg->type->type) {
-                       if (iarg->def) {
-                               iarg->val.lval = zend_atol(iarg->def->text, strlen(iarg->def->text));
-                       }
-                       Z_PARAM_LONG(iarg->val.lval);
-               } else if (PSI_T_FLOAT == iarg->type->type) {
-                       if (iarg->def) {
-                               iarg->val.dval = zend_strtod(iarg->def->text, NULL);
-                       }
-                       Z_PARAM_DOUBLE(iarg->val.dval);
-               } else if (PSI_T_STRING == iarg->type->type) {
-                       if (iarg->def) {
-                               /* FIXME */
-                               iarg->val.str.len = strlen(iarg->def->text) - 2;
-                               iarg->val.str.val = &iarg->def->text[1];
+
+               if (fn->inner) {
+                       size_t i;
+
+                       for (i = 0; i < fn->inner->count; ++i) {
+                               psi_jit_destroy_callbacks(C, fn->inner->vals[i]);
                        }
-                       Z_PARAM_STRING(iarg->val.str.val, iarg->val.str.len);
-               } else {
-                       error_code = ZPP_ERROR_FAILURE;
-                       break;
                }
-               iarg->_zv = _arg;
-               if (_i < _max_num_args) {
-                       goto nextarg;
+               break;
+       default:
+               break;
+       }
+}
+
+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];
+
+                       if (decl->call.info) {
+                               psi_jit_call_free(decl->call.info);
+                       }
                }
-       ZEND_PARSE_PARAMETERS_END();
-
-       if (data->impl->decl->args->count) {
-               arg_ptr = malloc(data->impl->decl->args->count * sizeof(*arg_ptr));
-               arg_prm = malloc(data->impl->decl->args->count * sizeof(*arg_prm));
-               arg_val = malloc(data->impl->decl->args->count * sizeof(*arg_val));
-               sig_prm = malloc(data->impl->decl->args->count * sizeof(*sig_prm));
-
-               for (i = 0; i < data->impl->decl->args->count; ++i) {
-                       decl_arg *darg = data->impl->decl->args->args[i];
-                       impl_arg *iarg = darg->let->arg;
-
-                       switch (darg->let->val->func->type) {
-                       case PSI_T_BOOLVAL:
-                               if (iarg->type->type == PSI_T_BOOL) {
-                                       arg_val[i].bval = iarg->val.bval;
-                               } else {
-                                       arg_val[i].bval = zend_is_true(iarg->_zv);
-                               }
-                               break;
-                       case PSI_T_INTVAL:
-                               if (iarg->type->type == PSI_T_INT) {
-                                       arg_val[i].lval = iarg->val.lval;
-                               } else {
-                                       arg_val[i].lval = zval_get_long(iarg->_zv);
-                               }
-                               break;
-                       case PSI_T_STRVAL:
-                               if (iarg->type->type == PSI_T_STRING) {
-                                       arg_val[i].str.val = estrndup(iarg->val.str.val, iarg->val.str.len);
-                               } else {
-                                       zend_string *zs = zval_get_string(iarg->_zv);
-                                       arg_val[i].str.val = estrndup(zs->val, zs->len);
-                                       zend_string_release(zs);
-                               }
-                               break;
-                       case PSI_T_STRLEN:
-                               if (iarg->type->type == PSI_T_STRING) {
-                                       arg_val[i].lval =iarg->val.str.len;
-                               } else {
-                                       zend_string *zs = zval_get_string(iarg->_zv);
-                                       arg_val[i].lval = zs->len;
-                                       zend_string_release(zs);
-                               }
-                               break;
+       }
+       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);
                        }
-                       arg_ptr[i] = &arg_val[i];
-                       arg_prm[i] = darg->let->val->is_reference ? &arg_ptr[i] : arg_ptr[i];
-                       sig_prm[i] = psi_jit_decl_arg_type(darg);
                }
        }
+       psi_jit_context_free((void *) &C->context);
+}
 
-       signature = jit_type_create_signature(
-                       psi_jit_abi(data->impl->decl->abi->convention),
-                       psi_jit_decl_arg_type(data->impl->decl->func),
-                       sig_prm,
-                       data->impl->decl->args->count,
-                       1);
-       jit_apply(signature, data->impl->decl->dlptr, arg_prm, data->impl->decl->args->count, &ret_val);
-
-       switch (data->impl->stmts->ret.list[0]->func->type) {
-       case PSI_T_TO_STRING:
-               if (data->impl->decl->func->var->pointer_level) {
-                       switch (real_decl_type(data->impl->decl->func->type)->type) {
-                       case PSI_T_CHAR:
-                       case PSI_T_SINT8:
-                       case PSI_T_UINT8:
-                               RETVAL_STRING(ret_val.str.val);
+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 *compile(PSI_Context *C, PSI_Data *D)
+static zend_function_entry *psi_jit_compile(struct psi_context *C)
 {
-       size_t i, j = 0;
-       jit_type_t signature, params[] = {
-               jit_type_void_ptr,
-               jit_type_void_ptr
-       };
-       zend_function_entry *zfe = calloc(D->impls->count + 1, sizeof(*zfe));
+       size_t c, i, j = 0;
+       zend_function_entry *zfe;
+       struct psi_jit_context *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 < C->impls->count; ++i) {
+               zend_function_entry *zf = &zfe[j];
+               struct psi_jit_call *call;
+               impl *impl = C->impls->list[i];
 
-       jit_context_build_start(C->opaque);
+               if (!impl->decl) {
+                       continue;
+               }
+
+               if ((call = psi_jit_call_alloc(C, impl->decl))) {
+                       if (!psi_jit_call_init_closure(C, call, impl)) {
+                               psi_jit_call_free(call);
+                               continue;
+                       }
+               }
 
-       for (i = 0; i < D->impls->count; ++i) {
-               zend_function_entry *zf;
-               PSI_ClosureData *data;
+               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;
 
-               if (!D->impls->list[i]->decl) {
+               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->call.info) {
                        continue;
                }
 
-               zf = &zfe[j++];
-               data = PSI_ClosureDataAlloc(C, D->impls->list[i]);
-               signature = jit_type_create_signature(jit_abi_cdecl, jit_type_void, params, 2, 1);
-               zf->fname = D->impls->list[i]->func->name + (D->impls->list[i]->func->name[0] == '\\');
-               zf->handler = jit_closure_create(C->opaque, signature, &handler, data);
+               psi_jit_call_alloc(C, decl);
        }
 
-       jit_context_build_end(C->opaque);
+       jit_context_build_end(ctx->jit);
 
        return zfe;
 }
 
-static PSI_ContextOps ops = {
-       init,
-       dtor,
-       compile,
+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;
+               size_t i, nfixedargs = decl_call->argc, ntotalargs = nfixedargs + va->args->count;
+               void **params = calloc(2 * ntotalargs + 2, sizeof(void *));
+
+               for (i = 0; i < nfixedargs; ++i) {
+                       params[i] = call->params[i];
+                       params[i + ntotalargs + 1] = call->params[i + nfixedargs + 1];
+               }
+               for (i = 0; i < va->args->count; ++i) {
+                       params[nfixedargs + i] = psi_jit_impl_type(va->types[i]);
+                       params[nfixedargs + i + ntotalargs + 1] = &va->values[i];
+               }
+
+               signature = jit_type_create_signature(
+                               jit_type_get_abi(call->signature),
+                               jit_type_get_return(call->signature),
+                               (jit_type_t *) params, ntotalargs, 1);
+               ZEND_ASSERT(signature);
+
+               jit_apply(signature, decl_call->sym, &params[ntotalargs + 1],
+                                               nfixedargs, *decl_call->rval);
+               jit_type_free(signature);
+               free(params);
+       } else {
+               jit_apply(call->signature, decl_call->sym, decl_call->args,
+                               decl_call->argc, *decl_call->rval);
+       }
+}
+
+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;
 }
+
+#endif /* HAVE_LIBJIT */