fix leaks
[m6w6/ext-psi] / src / libjit.c
index 7b0a49a5cadd6748edd886ba5345570c9d292ddf..513d5477e63b73b7ad8194c2f1f56c1fd01375fc 100644 (file)
@@ -1,26 +1,54 @@
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
+/*******************************************************************************
+ Copyright (c) 2016, Michael Wallner <mike@php.net>.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *******************************************************************************/
+
+#include "php_psi_stdinc.h"
+#include "context.h"
+#include "call.h"
 #include "php.h"
 
 #ifdef HAVE_LIBJIT
 
-#include "php_psi.h"
-#include "libjit.h"
-
 #include <jit/jit.h>
 
-static void psi_jit_handler(jit_type_t _sig, void *result, void **_args, void *_data);
-static inline jit_type_t psi_jit_decl_arg_type(decl_arg *darg);
+static inline jit_type_t psi_jit_decl_arg_type(struct psi_decl_arg *darg);
 
-static inline jit_abi_t psi_jit_abi(const char *convention) {
+static inline jit_abi_t psi_jit_abi(const char *convention)
+{
+       if (!strcasecmp(convention, "stdcall")) {
+               return jit_abi_stdcall;
+       }
+       if (!strcasecmp(convention, "fastcall")) {
+               return jit_abi_fastcall;
+       }
        return jit_abi_cdecl;
 }
-static inline jit_type_t psi_jit_token_type(token_t t) {
+static inline jit_type_t psi_jit_token_type(token_t t)
+{
        switch (t) {
        default:
-               ZEND_ASSERT(0);
+               assert(0);
                /* no break */
        case PSI_T_VOID:
                return jit_type_void;
@@ -43,6 +71,7 @@ static inline jit_type_t psi_jit_token_type(token_t t) {
        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;
@@ -55,10 +84,12 @@ static inline jit_type_t psi_jit_token_type(token_t t) {
                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) {
+static inline jit_type_t psi_jit_impl_type(token_t impl_type)
+{
        switch (impl_type) {
        case PSI_T_BOOL:
                return jit_type_sbyte;
@@ -69,17 +100,35 @@ static inline jit_type_t psi_jit_impl_type(token_t impl_type) {
        case PSI_T_FLOAT:
        case PSI_T_DOUBLE:
                return jit_type_sys_double;
-       EMPTY_SWITCH_DEFAULT_CASE();
+       EMPTY_SWITCH_DEFAULT_CASE()
+               ;
        }
        return NULL;
 }
-static void psi_jit_struct_type_dtor(void *type) {
-       jit_type_t strct = type;
 
+struct psi_jit_struct_type {
+       jit_type_t strct;
+       jit_type_t *fields;
+};
+
+static void psi_jit_struct_type_dtor(void *ptr)
+{
+       struct psi_jit_struct_type *type = ptr;
+       jit_type_t strct = type->strct;
+       unsigned i, n = jit_type_num_fields(strct);
+
+       for (i = 0; i < n; ++i) {
+               jit_type_t field = jit_type_get_field(strct, i);
+
+               jit_type_free(field);
+       }
        jit_type_free(strct);
+       free(type->fields);
+       free(type);
 }
 
-static size_t psi_jit_struct_type_pad(jit_type_t **els, size_t padding) {
+static size_t psi_jit_struct_type_pad(jit_type_t *els, size_t padding)
+{
        size_t i;
 
        for (i = 0; i < padding; ++i) {
@@ -89,21 +138,32 @@ static size_t psi_jit_struct_type_pad(jit_type_t **els, size_t padding) {
        return padding;
 }
 
-static unsigned psi_jit_struct_type_elements(decl_struct *strct, jit_type_t **fields) {
-       size_t i, j, argc = strct->args->count, nels = 0, offset = 0, maxalign;
+static unsigned psi_jit_struct_type_elements(struct psi_decl_struct *strct,
+               jit_type_t **fields)
+{
+       size_t i = 0, argc = psi_plist_count(strct->args), nels = 0, offset = 0,
+                       maxalign = 0, last_arg_pos = -1;
+       struct psi_decl_arg *darg;
+
        *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));
+       while (psi_plist_get(strct->args, i++, &darg)) {
+               jit_type_t type;
                size_t padding, alignment;
 
-               ZEND_ASSERT(jit_type_get_size(type) == darg->layout->len);
+               if (darg->layout->pos == last_arg_pos) {
+                       /* skip bit fields */
+                       continue;
+               }
+               last_arg_pos = darg->layout->pos;
+
+               type = jit_type_copy(psi_jit_decl_arg_type(darg));
 
                if ((alignment = jit_type_get_alignment(type)) > maxalign) {
                        maxalign = alignment;
                }
 
+               assert(jit_type_get_size(type) == darg->layout->len);
                if ((padding = psi_offset_padding(darg->layout->pos - offset, alignment))) {
                        if (nels + padding > argc) {
                                argc += padding;
@@ -113,42 +173,56 @@ static unsigned psi_jit_struct_type_elements(decl_struct *strct, jit_type_t **fi
                        nels += padding;
                        offset += padding;
                }
-               ZEND_ASSERT(offset == darg->layout->pos);
+               assert(offset == darg->layout->pos);
 
-               offset = (offset + darg->layout->len + alignment - 1) & ~(alignment - 1);
+               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);
+       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) {
-       decl_type *real = real_decl_type(type);
+static inline jit_type_t psi_jit_decl_type(struct psi_decl_type *type)
+{
+       struct psi_decl_type *real = psi_decl_type_get_real(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;
+                       struct psi_jit_struct_type *type = calloc(1, sizeof(*type));
                        jit_type_t strct, *fields = NULL;
 
-                       count = psi_jit_struct_type_elements(real->strct, &fields);
-                       strct = jit_type_create_struct(fields, count, 0);
+                       count = psi_jit_struct_type_elements(real->real.strct, &type->fields);
+                       type->strct = jit_type_create_struct(type->fields, count, 0);
+
+                       real->real.strct->engine.type = type;
+                       real->real.strct->engine.dtor = psi_jit_struct_type_dtor;
+               }
+
+               return real->real.strct->engine.type;
 
-                       real->strct->engine.type = strct;
-                       real->strct->engine.dtor = psi_jit_struct_type_dtor;
+       case PSI_T_UNION:
+               {
+                       struct psi_decl_arg *arg;
+                       psi_plist_get(real->real.unn->args, 0, &arg);
+                       return psi_jit_decl_arg_type(arg);
                }
 
-               return real->strct->engine.type;
+       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) {
+static inline jit_type_t psi_jit_decl_arg_type(struct psi_decl_arg *darg)
+{
        if (darg->var->pointer_level) {
                return jit_type_void_ptr;
        } else {
@@ -156,64 +230,106 @@ static inline jit_type_t psi_jit_decl_arg_type(decl_arg *darg) {
        }
 }
 
-typedef struct PSI_LibjitContext {
+struct psi_jit_context {
        jit_context_t jit;
        jit_type_t signature;
-       struct {
-               struct PSI_LibjitData **list;
-               size_t count;
-       } data;
-} PSI_LibjitContext;
+};
 
-typedef struct PSI_LibjitCall {
+struct psi_jit_call {
+       struct psi_context *context;
+       union {
+               struct {
+                       struct psi_impl *impl;
+                       struct psi_call_frame *frame;
+               } fn;
+               struct {
+                       struct psi_let_exp *let_exp;
+                       struct psi_jit_call *impl_call;
+               } cb;
+       } impl;
        void *closure;
        jit_type_t signature;
-       void *params[1]; /* [type1, type2, NULL, arg1, arg2] ... */
-} PSI_LibjitCall;
+       void *params[1]; /* [type1, type2, ... ] */
+};
 
-typedef struct PSI_LibjitData {
-       PSI_LibjitContext *context;
-       impl *impl;
-       zend_internal_arg_info *arginfo;
-} PSI_LibjitData;
+static void psi_jit_handler(jit_type_t sig, void *result, void **args, void *data)
+{
+       struct psi_jit_call *call = data;
 
-static inline PSI_LibjitCall *PSI_LibjitCallAlloc(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 *));
+       psi_context_call(call->context, *(zend_execute_data **)args[0], *(zval **) args[1], call->impl.fn.impl);
+}
+
+static void psi_jit_callback(jit_type_t sig, void *result, void **args,
+               void *data)
+{
+       struct psi_jit_call *call = data, *impl_call = call->impl.cb.impl_call;
+       struct psi_call_frame_callback cbdata;
 
-       for (i = 0; i < c; ++i) {
-               call->params[i] = psi_jit_decl_arg_type(decl->args->args[i]);
+       cbdata.cb = call->impl.cb.let_exp;
+       cbdata.argc = jit_type_num_params(sig);
+       cbdata.argv = args;
+       cbdata.rval = result;
+
+       psi_call_frame_do_callback(impl_call->impl.fn.frame, &cbdata);
+}
+
+static inline struct psi_jit_call *psi_jit_call_alloc(struct psi_context *C,
+               struct psi_decl *decl)
+{
+       size_t i, c = psi_plist_count(decl->args);
+       struct psi_jit_call *call = calloc(1, sizeof(*call) + 2 * c * sizeof(void *));
+       struct psi_decl_arg *arg;
+
+       decl->info = call;
+       call->context = C;
+       for (i = 0; psi_plist_get(decl->args, i, &arg); ++i) {
+               call->params[i] = psi_jit_decl_arg_type(arg);
        }
        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);
+                       (jit_type_t *) call->params,
+                       c, 1);
+       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,
-                       &psi_jit_handler, impl);
+static inline void *psi_jit_call_init_closure(struct psi_context *C,
+               struct psi_jit_call *call, struct psi_impl *impl)
+{
+       struct psi_jit_context *context = C->context;
+
+       call->impl.fn.impl = impl;
+       return call->closure = jit_closure_create(context->jit, context->signature,
+                       &psi_jit_handler, call);
+}
+
+static inline void *psi_jit_call_init_callback_closure(struct psi_context *C,
+               struct psi_jit_call *call, struct psi_jit_call *impl_call,
+               struct psi_let_exp *cb)
+{
+       struct psi_jit_context *context = C->context;
+
+       call->impl.cb.let_exp = cb;
+       call->impl.cb.impl_call = impl_call;
+
+       return call->closure = jit_closure_create(context->jit, call->signature,
+                       &psi_jit_callback, call);
 }
 
-static inline void PSI_LibjitCallFree(PSI_LibjitCall *call) {
+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) {
-       jit_type_t params[] = {
-               jit_type_void_ptr,
-               jit_type_void_ptr
-       };
+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));
@@ -227,83 +343,175 @@ static inline PSI_LibjitContext *PSI_LibjitContextInit(PSI_LibjitContext *L) {
        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)
+static inline void psi_jit_destroy_callbacks(struct psi_context *C,
+               struct psi_let_exp *let_exp)
 {
-       C->context = PSI_LibjitContextInit(NULL);
+       struct psi_let_callback *cb;
+       struct psi_let_func *fn = NULL;
+
+       switch (let_exp->kind) {
+       case PSI_LET_CALLBACK:
+               cb = let_exp->data.callback;
+
+               if (cb->decl && cb->decl->info) {
+                       psi_jit_call_free(cb->decl->info);
+               }
+               fn = cb->func;
+               /* no break */
+       case PSI_LET_FUNC:
+               if (!fn) {
+                       fn = let_exp->data.func;
+               }
+
+               if (fn->inner) {
+                       size_t i = 0;
+                       struct psi_let_exp *inner_let;
+
+                       while (psi_plist_get(fn->inner, i++, &inner_let)) {
+                               psi_jit_destroy_callbacks(C, inner_let);
+                       }
+               }
+               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;
+               size_t i = 0;
+               struct psi_decl *decl;
 
-               for (i = 0; i < C->decls->count; ++i) {
-                       decl *decl = C->decls->list[i];
+               while (psi_plist_get(C->decls, i++, &decl)) {
+                       if (decl->info) {
+                               psi_jit_call_free(decl->info);
+                       }
+               }
+       }
+       if (C->impls) {
+               size_t i = 0;
+               struct psi_impl *impl;
 
-                       PSI_LibjitCallFree(decl->call.info);
+               while (psi_plist_get(C->impls, i++, &impl)) {
+                       size_t l = 0;
+                       struct psi_let_stmt *let;
+
+                       while (psi_plist_get(impl->stmts.let, l++, &let)) {
+                               psi_jit_destroy_callbacks(C, let->exp);
+                       }
                }
        }
-       PSI_LibjitContextFree((void *) &C->context);
+       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,
+               struct psi_jit_call *impl_call, struct psi_let_exp *let_exp)
 {
-       size_t i, j = 0;
+       struct psi_jit_call *call;
+       struct psi_let_callback *cb;
+       struct psi_let_func *fn = NULL;
+
+       switch (let_exp->kind) {
+       case PSI_LET_CALLBACK:
+               cb = let_exp->data.callback;
+               if ((call = psi_jit_call_alloc(C, cb->decl))) {
+                       if (!psi_jit_call_init_callback_closure(C, call, impl_call, let_exp)) {
+                               psi_jit_call_free(call);
+                               break;
+                       }
+
+                       cb->decl->sym = call->closure;
+               }
+               fn = cb->func;
+               /* no break */
+       case PSI_LET_FUNC:
+               if (!fn) {
+                       fn = let_exp->data.func;
+               }
+               if (fn->inner) {
+                       size_t i = 0;
+                       struct psi_let_exp *inner_let;
+
+                       while (psi_plist_get(fn->inner, i++, &inner_let)) {
+                               psi_jit_compile_callbacks(C, impl_call, inner_let);
+                       }
+               }
+               break;
+       default:
+               break;
+       }
+}
+
+static zend_function_entry *psi_jit_compile(struct psi_context *C)
+{
+       size_t i = 0, d = 0, nf = 0;
+       struct psi_impl *impl;
+       struct psi_decl *decl;
        zend_function_entry *zfe;
-       PSI_LibjitContext *ctx = C->context;
+       struct psi_jit_context *ctx = C->context;
 
        if (!C->impls) {
                return NULL;
        }
 
-       zfe = calloc(C->impls->count + 1, sizeof(*zfe));
+       zfe = calloc(psi_plist_count(C->impls) + 1, sizeof(*zfe));
        jit_context_build_start(ctx->jit);
 
-       for (i = 0; i < C->impls->count; ++i) {
-               zend_function_entry *zf = &zfe[j];
-               PSI_LibjitCall *call;
-               impl *impl = C->impls->list[i];
+       while (psi_plist_get(C->impls, i++, &impl)) {
+               zend_function_entry *zf = &zfe[nf];
+               struct psi_jit_call *call;
+               size_t l = 0;
+               struct psi_let_stmt *let;
 
                if (!impl->decl) {
                        continue;
                }
-
-               call = PSI_LibjitCallAlloc(C, impl->decl);
-               PSI_LibjitCallInitClosure(C, call, impl);
+               if (!(call = psi_jit_call_alloc(C, impl->decl))) {
+                       continue;
+               }
+               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->num_args = psi_plist_count(impl->func->args);
                zf->arg_info = psi_internal_arginfo(impl);
-               ++j;
-       }
+               ++nf;
 
-       for (i = 0; i < C->decls->count; ++i) {
-               decl *decl = C->decls->list[i];
+               while (psi_plist_get(impl->stmts.let, l++, &let)) {
+                       psi_jit_compile_callbacks(C, call, let->exp);
+               }
+       }
 
-               if (decl->impl) {
+       while (psi_plist_get(C->decls, d++, &decl)) {
+               if (decl->info) {
                        continue;
                }
 
-               PSI_LibjitCallAlloc(C, decl);
+               psi_jit_call_alloc(C, decl);
        }
 
        jit_context_build_end(ctx->jit);
@@ -311,47 +519,58 @@ static zend_function_entry *psi_jit_compile(PSI_Context *C)
        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, struct psi_call_frame *frame,
+               struct psi_decl *decl, void *rval, void **args)
+{
+       struct psi_jit_call *call = decl->info;
+       struct psi_call_frame *prev = call->impl.fn.frame;
+
+       call->impl.fn.frame = frame;
+       jit_apply(call->signature, decl->sym, args, psi_plist_count(decl->args), rval);
+       call->impl.fn.frame = prev;
+}
+
+static void psi_jit_call_va(struct psi_context *C, struct psi_call_frame *frame,
+               struct psi_decl *decl, void *rval, void **args, size_t va_count,
+               void **va_types)
+{
+       struct psi_jit_call *info = decl->info;
+       struct psi_call_frame *prev = info->impl.fn.frame;
+       size_t argc = psi_plist_count(decl->args);
+       jit_type_t signature;
+       jit_type_t *param_types = ecalloc(argc + va_count + 1, sizeof(jit_type_t));
 
-       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 *));
+       memcpy(param_types, info->params, argc * sizeof(jit_type_t));
+       memcpy(param_types + argc, va_types, va_count * sizeof(jit_type_t));
 
-               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_abi_vararg,
+                       jit_type_get_return(info->signature), param_types, argc + va_count,
+                       1);
+       assert(signature);
 
-               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);
+       info->impl.fn.frame = frame;
+       jit_apply(signature, decl->sym, args, argc, rval);
+       info->impl.fn.frame = prev;
+       jit_type_free(signature);
+       efree(param_types);
+}
 
-               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 void *psi_jit_query(struct psi_context *C, enum psi_context_query q,
+               void *arg)
+{
+       switch (q) {
+       case PSI_CONTEXT_QUERY_SELF:
+               return "jit";
+       case PSI_CONTEXT_QUERY_TYPE:
+               return psi_jit_impl_type(*(token_t *) arg);
        }
+       return NULL;
 }
 
-static PSI_ContextOps ops = {
-       psi_jit_init,
-       psi_jit_dtor,
-       psi_jit_compile,
-       psi_jit_call,
-};
+static struct psi_context_ops ops = {psi_jit_init, psi_jit_dtor,
+               psi_jit_compile, psi_jit_call, psi_jit_call_va, psi_jit_query};
 
-PSI_ContextOps *PSI_Libjit(void)
+struct psi_context_ops *psi_libjit_ops(void)
 {
        return &ops;
 }