build cleanup
[m6w6/ext-psi] / src / context.c
index 18e76e4db451b06fdde9f37537a6a1b09608451b..ebe4e08ed5fddabe4cb34f3e35cfae3202d89bed 100644 (file)
-#include <sys/param.h>
-#include <dlfcn.h>
-#include <dirent.h>
-#include <fnmatch.h>
-#include <errno.h>
+/*******************************************************************************
+ 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.
+*******************************************************************************/
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
 #include "php.h"
+
+#ifdef HAVE_DIRENT_H
+# include <dirent.h>
+# define NAMLEN(dirent) strlen ((dirent)->d_name)
+#else
+# define dirent direct
+# define NAMLEN(dirent) ((dirent)->d_namlen)
+# ifdef HAVE_SYS_NDIR_H
+#  include <sys/ndir.h>
+# endif
+# ifdef HAVE_SYS_DIR_H
+#  include <sys/dir.h>
+# endif
+# ifdef HAVE_NDIR_H
+#  include <ndir.h>
+# endif
+#endif
+
+#include <unistd.h>
+#include <fnmatch.h>
+
+#if PSI_THREADED_PARSER
+# include <pthread.h>
+#endif
+
 #include "php_scandir.h"
 #include "php_psi.h"
-#include "context.h"
+#include "calc.h"
+#include "call.h"
+#include "libjit.h"
+#include "libffi.h"
+
+#include "token.h"
 #include "parser.h"
 
-#define psi_predef_count(of) ((sizeof(psi_predef ##of## s)/sizeof(psi_predef ##of))-1)
-typedef struct psi_predef_type {
-       token_t type_tag;
-       const char *type_name;
-       const char *alias;
-} psi_predef_type;
-static const psi_predef_type psi_predef_types[] = {
-       PHP_PSI_TYPES{0}
-};
-#define psi_predef_type_count() psi_predef_count(_type)
-
-typedef struct psi_predef_const {
-       token_t type_tag;
-       const char *type_name;
-       const char *name;
-       const char *val_text;
-       token_t val_type_tag;
-} psi_predef_const;
-static const psi_predef_const psi_predef_consts[] = {
-       PHP_PSI_CONSTS{0}
-};
-#define psi_predef_const_count() psi_predef_count(_const)
-
-typedef struct psi_predef_struct_member {
-       token_t type_tag;
-       const char *type_name;
-       const char *name;
-       size_t off;
-       size_t len;
-       size_t pointer_level;
-       size_t array_size;
-} psi_predef_struct_member;
-#define PSI_PREDEF_STRUCT_MEMBERS 32
-typedef struct psi_predef_struct {
-       const char *name;
-       size_t size;
-       psi_predef_struct_member members[PSI_PREDEF_STRUCT_MEMBERS];
-} psi_predef_struct;
-static const psi_predef_struct psi_predef_structs[] = {
-       PHP_PSI_STRUCTS{0}
-};
-#define psi_predef_struct_count() psi_predef_count(_struct)
+PHP_MINIT_FUNCTION(psi_context)
+{
+       unsigned flags = 0;
+       struct psi_context_ops *ops = NULL;
 
-PHP_PSI_MACROS
+#ifdef HAVE_LIBJIT
+       if (!strcasecmp(PSI_G(engine), "jit")) {
+               ops = psi_libjit_ops();
+       } else
+#endif
+#ifdef HAVE_LIBFFI
+               ops = psi_libffi_ops();
+#endif
 
-typedef struct psi_predef_func {
-       const char *name;
-       void (*func)(void);
-} psi_predef_func;
-static psi_predef_func psi_predef_funcs[] = {
-       PHP_PSI_FUNCS{0}
-};
-#define psi_predef_func_count() psi_predef_count(_func)
-
-static int validate_lib(PSI_Data *data, void **dlopened) {
-       char lib[MAXPATHLEN];
-       const char *ptr = data->psi.file.ln;
-       size_t len;
-
-       if (!ptr) {
-               /* FIXME: assume stdlib */
-               return 1;
-       } else if (!strchr(ptr, '/')) {
-               len = snprintf(lib, MAXPATHLEN, "lib%s.%s", ptr, PHP_PSI_SHLIB_SUFFIX);
-               if (MAXPATHLEN == len) {
-                       data->error(PSI_WARNING, "Library name too long: '%s'", ptr);
-               }
-               lib[len] = 0;
-               ptr = lib;
+       if (!ops) {
+               php_error(E_WARNING, "No PSI engine found");
+               return FAILURE;
        }
-       if (!(*dlopened = dlopen(ptr, RTLD_LAZY|RTLD_LOCAL))) {
-               data->error(PSI_WARNING, "Could not open library '%s': %s.",
-                               data->psi.file.ln, dlerror());
-               return 0;
-       }
-       return 1;
-}
 
-static inline int locate_decl_type_alias(decl_typedefs *defs, decl_type *type) {
-       size_t i;
-
-       if (type->real) {
-               return 1;
+       PSI_G(ops) = ops;
+       if (ops->load && !ops->load()) {
+               return FAILURE;
        }
-       for (i = 0; i < defs->count; ++i) {
-               if (!strcmp(defs->list[i]->alias, type->name)) {
-                       type->real = defs->list[i]->type;
-                       return 1;
-               }
-       }
-       return 0;
-}
-static inline int locate_decl_type_struct(decl_structs *structs, decl_type *type) {
-       size_t i;
 
-       if (type->strct) {
-               return 1;
+       if (psi_check_env("PSI_DEBUG")) {
+               flags |= PSI_DEBUG;
        }
-       for (i = 0; i < structs->count; ++i) {
-               if (!strcmp(structs->list[i]->name, type->name)) {
-                       type->strct = structs->list[i];
-                       return 1;
-               }
+       if (psi_check_env("PSI_SILENT")) {
+               flags |= PSI_SILENT;
        }
-       return 0;
+
+       PSI_G(context) = psi_context_init(NULL, PSI_G(ops), psi_error_wrapper, flags);
+       psi_context_build(PSI_G(context), PSI_G(directory));
+
+       return SUCCESS;
 }
 
-static inline int validate_decl_type(PSI_Data *data, decl_type *type) {
-       switch (type->type) {
-       case PSI_T_NAME:
-               if (!data->defs || !locate_decl_type_alias(data->defs, type)) {
-                       return 0;
-               }
-               return validate_decl_type(data, type->real);
-       case PSI_T_STRUCT:
-               if (!data->structs || !locate_decl_type_struct(data->structs, type)) {
-                       return 0;
-               }
-               break;
+PHP_MSHUTDOWN_FUNCTION(psi_context)
+{
+       if (psi_check_env("PSI_DUMP")) {
+               struct psi_dump dump = {{.hn = stdout}, (psi_dump_cb) fprintf};
+
+               psi_context_dump(&dump, PSI_G(context));
        }
-       return 1;
-}
-static inline int validate_decl_typedef(PSI_Data *data, decl_typedef *def) {
-       if (!validate_decl_type(data, def->type)) {
-               data->error(PSI_WARNING, "Type '%s' cannot be aliased to '%s'",
-                       def->type->name, def->alias);
-               return 0;
+
+       psi_context_free(&PSI_G(context));
+
+       if (PSI_G(ops)->free) {
+               PSI_G(ops)->free();
        }
-       /* FIXME: check def->alias */
-       return 1;
-}
 
-static inline int validate_constant(PSI_Data *data, constant *c) {
-       /* FIXME */
-       return 1;
+       return SUCCESS;
 }
 
-static inline int validate_decl_arg(PSI_Data *data, decl_arg *arg) {
-       if (!validate_decl_type(data, arg->type)) {
-               data->error(PSI_WARNING, "Cannot use '%s' as type for '%s'",
-                       arg->type->name, arg->var->name);
-               return 0;
+struct psi_context *psi_context_init(struct psi_context *C, struct psi_context_ops *ops, psi_error_cb error, unsigned flags)
+{
+       if (!C) {
+               C = pemalloc(sizeof(*C), 1);
        }
-       return 1;
-}
+       memset(C, 0, sizeof(*C));
 
-static inline int validate_decl_struct(PSI_Data *data, decl_struct *s) {
-       size_t i;
+       psi_data_ctor(PSI_DATA(C), error, flags);
+       C->ops = ops;
 
-       for (i = 0; i < s->args->count; ++i) {
-               if (!validate_decl_arg(data, s->args->args[i])) {
-                       return 0;
-               }
+       if (ops->init && !ops->init(C)) {
+               return NULL;
        }
 
-       for (i = 0; i < s->args->count; ++i) {
-               decl_arg *darg = s->args->args[i];
+       return C;
+}
 
-               if (!validate_decl_arg(data, darg)) {
-                       return 0;
-               }
+static bool psi_context_add(struct psi_context *C, struct psi_parser *P)
+{
+       bool valid;
+       struct psi_data *D;
+       struct psi_validate_scope scope = {0};
 
-               ZEND_ASSERT(!darg->var->arg || darg->var->arg == darg);
-               darg->var->arg = darg;
+       C->data = safe_perealloc(C->data, (C->count + 1), sizeof(*C->data), 0, 1);
+       D = psi_data_exchange(&C->data[C->count++], PSI_DATA(P));
 
-               if (!darg->layout) {
-                       token_t t;
+       psi_validate_scope_ctor(&scope);
+       scope.cpp = P->preproc;
+       valid = psi_validate(&scope, PSI_DATA(C), D);
+       psi_validate_scope_dtor(&scope);
 
-                       if (darg->var->pointer_level && (!darg->var->array_size || darg->var->pointer_level == 1)) {
-                               t = PSI_T_POINTER;
-                       } else {
-                               t = real_decl_type(darg->type)->type;
-                       }
+       return valid;
+}
 
-                       if (i) {
-                               decl_arg *last = s->args->args[i-1];
-                               darg->layout = init_decl_struct_layout(
-                                               psi_t_align(t, last->layout->pos + last->layout->len),
-                                               psi_t_size(t) * darg->var->array_size);
-                       } else {
-                               darg->layout = init_decl_struct_layout(0, psi_t_size(t));
-                       }
-               }
-               if (s->size < darg->layout->pos + darg->layout->len) {
-                       s->size = darg->layout->pos + darg->layout->len;
-               }
+struct psi_context_build_worker {
+       pthread_t tid;
+       struct psi_parser parser;
+       struct psi_parser_input *input;
+       char psi_file[MAXPATHLEN];
+};
+
+static struct psi_context_build_worker *psi_context_build_worker_init(
+               struct psi_context *C, const char *dir, const char *file)
+{
+       struct psi_context_build_worker *w = pecalloc(1, sizeof(*w), 1);
+
+       if (MAXPATHLEN <= slprintf(w->psi_file, MAXPATHLEN, "%s/%s", dir, file)) {
+               C->error(PSI_DATA(C), NULL, PSI_WARNING, "Path to PSI file too long: %s/%s",
+                       dir, file);
+               pefree(w, 1);
+               return NULL;
+       }
+       if (!psi_parser_init(&w->parser, C->error, C->flags)) {
+               C->error(PSI_DATA(C), NULL, PSI_WARNING, "Failed to init PSI parser (%s): %s",
+                       w->psi_file, strerror(errno));
+               pefree(w, 1);
+               return NULL;
        }
-       return 1;
+       return w;
 }
 
-static const char * const abi_ccs[] = {
-               "default", /* \                 */
-               "extern",  /*  > - all the same */
-               "cdecl",   /* /                 */
-               "stdcall",
-               "fastcall",
-};
-static inline int validate_decl_abi(PSI_Data *data, decl_abi *abi) {
-       size_t i;
+#if PSI_THREADED_PARSER
+static void *psi_context_build_worker_thread(void *thread_ptr)
+{
+       struct psi_context_build_worker *thread = thread_ptr;
+       psi_parser_parse(&thread->parser, thread->input);
+       return NULL;
+}
 
-       for (i = 0; i < sizeof(abi_ccs)/sizeof(char*); ++i) {
-               if (strcasecmp(abi->convention, abi_ccs[i])) {
-                       return 1;
-               }
+static bool psi_context_build_worker_thread_start(
+               struct psi_context_build_worker *w)
+{
+       unsigned tries = 0;
+       int rc;
+
+again: ;
+       rc = pthread_create(&w->tid, NULL, psi_context_build_worker_thread, w);
+
+       switch (rc) {
+       case 0:
+               return true;
+       case EAGAIN:
+               if (tries++ < 10) {
+                       goto again;
+               }
+               /* no break */
+       default:
+               w->parser.error(PSI_DATA(&w->parser), NULL, PSI_WARNING,
+                               "Failed to start parser thread: %s", strerror(rc));
+               w->tid = 0;
+               return false;
        }
-       data->error(PSI_WARNING, "Invalid calling convention: '%s'", abi->convention);
-       return 0;
 }
-static inline int validate_decl_func(PSI_Data *data, void *dl, decl *decl, decl_arg *func)
+#endif
+
+static bool psi_context_build_worker_exec(struct psi_context_build_worker *w)
 {
-       if (!strcmp(func->var->name, "dlsym")) {
-               data->error(PSI_WARNING, "Cannot dlsym dlsym (sic!)");
-               return 0;
+       if (!(w->input = psi_parser_open_file(&w->parser, w->psi_file, true))) {
+               w->parser.error(PSI_DATA(&w->parser), NULL, PSI_WARNING,
+                               "Failed to open PSI file (%s): %s", w->psi_file, strerror(errno));
+               return false;
+       }
+#if PSI_THREADED_PARSER
+       return psi_context_build_worker_thread_start(w);
+#else
+       return psi_parser_parse(&w->parser, w->input);
+#endif
+}
+
+static bool psi_context_build_worker_done(struct psi_context_build_worker *w)
+{
+#if PSI_THREADED_PARSER
+       void *rval = NULL;
+
+       if (!w->tid) {
+               return true;
        }
 
-       if (!validate_decl_arg(data, func)) {
-               return 0;
+# if HAVE_PTHREAD_TRYJOIN_NP
+       if (0 == pthread_tryjoin_np(w->tid, &rval)) {
+               w->tid = 0;
+               return true;
+       }
+# else
+       if (0 == pthread_join(w->tid, &rval)) {
+               w->tid = 0;
+               return true;
        }
-#ifndef RTLD_NEXT
-# define RTLD_NEXT ((void *) -1l)
+# endif
+       return false;
+#else
+       return true;
 #endif
-       decl->dlptr = dlsym(dl ?: RTLD_NEXT, func->var->name);
-       if (!decl->dlptr) {
-               size_t i;
+}
 
-               for (i = 0; i < psi_predef_func_count(); ++i) {
-                       psi_predef_func *pre = &psi_predef_funcs[i];
+static void psi_context_build_worker_dtor(struct psi_context_build_worker *w)
+{
+#if PSI_THREADED_PARSER
+       if (w->tid) {
+               void *rval;
+               int rc = pthread_join(w->tid, &rval);
 
-                       if (!strcmp(func->var->name, pre->name)) {
-                               decl->dlptr = pre->func;
-                               break;
-                       }
-               }
-               if (!decl->dlptr) {
-                       data->error(PSI_WARNING, "Failed to locate symbol '%s': %s",
-                               func->var->name, dlerror());
+               if (rc) {
+                       w->parser.error(PSI_DATA(&w->parser), NULL, PSI_WARNING,
+                                       "Failed to finish parser thread: %s", strerror(errno));
                }
        }
-       return 1;
+#endif
+       psi_parser_input_free(&w->input);
+       psi_parser_dtor(&w->parser);
 }
 
-static inline int validate_decl(PSI_Data *data, void *dl, decl *decl) {
-       if (!validate_decl_abi(data, decl->abi)) {
-               return 0;
-       }
-       if (!validate_decl_func(data, dl, decl, decl->func)) {
-               return 0;
+static void psi_context_build_worker_free(struct psi_context_build_worker **w)
+{
+       if (*w) {
+               psi_context_build_worker_dtor(*w);
+               pefree(*w, 1);
+               *w = NULL;
        }
-       if (decl->args) {
-               size_t i;
+}
 
-               for (i = 0; i < decl->args->count; ++i) {
-                       if (!validate_decl_arg(data, decl->args->args[i])) {
-                               return 0;
-                       }
-               }
-       }
-       return 1;
+static int psi_select_dirent(const struct dirent *entry)
+{
+#ifndef FNM_CASEFOLD
+# define FNM_CASEFOLD 0
+#endif
+       return 0 == fnmatch("*.psi", entry->d_name, FNM_CASEFOLD);
 }
 
-static inline decl_arg *locate_struct_member(decl_struct *s, decl_var *var) {
-       size_t i;
+void psi_context_build(struct psi_context *C, const char *paths)
+{
+       char *sep = NULL, *cpy = strdup(paths), *ptr = cpy;
+       struct psi_context_build_worker *worker;
+       struct psi_plist *workers = psi_plist_init(
+                       (psi_plist_dtor) psi_context_build_worker_free);
 
-       ZEND_ASSERT(s);
-       for (i = 0; i < s->args->count; ++i) {
-               decl_arg *darg = s->args->args[i];
+       do {
+               struct dirent **entries = NULL;
+               int i, n;
 
-               if (!strcmp(var->name, darg->var->name)) {
-                       return var->arg = darg;
+               if ((sep = strchr(ptr, ':'))) {
+                       *sep = 0;
                }
-       }
 
-       return NULL;
-}
-static inline int validate_set_value(PSI_Data *data, set_value *set, decl_arg *ref) {
-       size_t i;
-       decl_type *ref_type = real_decl_type(ref->type);
-       decl_var *set_var = set->vars->vars[0];
+               n = php_scandir(ptr, &entries, psi_select_dirent, alphasort);
 
-       switch (set->func->type) {
-       case PSI_T_TO_BOOL:
-               set->func->handler = psi_to_bool;
-               break;
-       case PSI_T_TO_INT:
-               set->func->handler = psi_to_int;
-               break;
-       case PSI_T_TO_FLOAT:
-               set->func->handler = psi_to_double;
-               break;
-       case PSI_T_TO_STRING:
-               set->func->handler = psi_to_string;
-               break;
-       case PSI_T_TO_ARRAY:
-               set->func->handler = psi_to_array;
-               break;
-       EMPTY_SWITCH_DEFAULT_CASE();
-       }
+               if (n < 0) {
+                       C->error(PSI_DATA(C), NULL, PSI_WARNING,
+                                       "Failed to scan PSI directory '%s':%s", strerror(errno));
+               } else {
+                       for (i = 0; i < n; ++i) {
+                               worker = psi_context_build_worker_init(C, ptr, entries[i]->d_name);
+                               if (worker) {
+                                       workers = psi_plist_add(workers, &worker);
+                               }
+                               free(entries[i]);
+                       }
+                       free(entries);
+               }
+               ptr = sep + 1;
+       } while (sep);
 
-       if (strcmp(set_var->name, ref->var->name)) {
-               return 0;
-       }
+       free(cpy);
 
-       if (set->count && (set->func->type != PSI_T_TO_ARRAY || ref_type->type != PSI_T_STRUCT)) {
-               data->error(E_WARNING, "Inner `set` statement casts only work with to_array() casts on structs");
-               return 0;
-       }
-       for (i = 0; i < set->count; ++i) {
-               decl_var *sub_var = set->inner[i]->vars->vars[0];
-               decl_arg *sub_ref = locate_struct_member(ref_type->strct, sub_var);
+       if (psi_plist_count(workers)) {
+               struct psi_plist *running = psi_plist_init(
+                               (psi_plist_dtor) psi_context_build_worker_free);
+               long active = 0;
+#ifdef _SC_NPROCESSORS_ONLN
+               long pool = sysconf(_SC_NPROCESSORS_ONLN);
+#else
+               long pool = 4;
+#endif
 
-               if (sub_ref) {
-                       if (!validate_set_value(data, set->inner[i], sub_ref)) {
-                               return 0;
+               while (psi_plist_count(workers) && active < pool) {
+                       if (psi_plist_pop(workers, &worker)) {
+                               if (psi_context_build_worker_exec(worker)) {
+                                       running = psi_plist_add(running, &worker);
+                                       ++active;
+                               }
                        }
                }
-       }
+               while (active) {
+                       size_t i = 0;
 
-       return 1;
-}
-static inline decl *locate_impl_decl(decls *decls, return_stmt *ret) {
-       size_t i;
+                       while (psi_plist_get(running, i++, &worker)) {
+                               if (psi_context_build_worker_done(worker)) {
+                                       psi_context_add(C, &worker->parser);
+
+                                       psi_plist_del(running, --i, NULL);
+                                       psi_context_build_worker_free(&worker);
 
-       for (i = 0; i < decls->count; ++i) {
-               if (!strcmp(decls->list[i]->func->var->name, ret->set->vars->vars[0]->name)) {
-                       ret->decl = decls->list[i]->func;
-                       return decls->list[i];
+                                       if (psi_plist_pop(workers, &worker)) {
+                                               psi_plist_add(running, &worker);
+                                       } else {
+                                               --active;
+                                       }
+                               }
+                       }
                }
        }
-       return NULL;
+
+       psi_context_compile(C);
 }
-static inline int validate_impl_ret_stmt(PSI_Data *data, impl *impl) {
-       return_stmt *ret;
 
-       /* we must have exactly one ret stmt delcaring the native func to call */
-       /* and which type cast to apply */
-       if (impl->stmts->ret.count != 1) {
-               if (impl->stmts->ret.count > 1) {
-                       data->error(PSI_WARNING, "Too many `return` statements for implmentation %s;"
-                                       " found %zu, exactly one is needed",
-                                       impl->func->name, impl->stmts->ret.count);
-               } else {
-                       data->error(PSI_WARNING, "Missing `return` statement for implementation %s",
-                                       impl->func->name);
+#include <ctype.h>
+static inline bool prefix_match(zend_string *a, zend_string *b)
+{
+       size_t i;
+
+       for (i = 0; i < a->len && i < b->len; ++i) {
+               if (tolower(a->val[i]) != tolower(b->val[i])) {
+                       return false;
+               }
+               if (i && a->val[i] == '_') {
+                       break;
                }
-               return 0;
        }
 
-       ret = impl->stmts->ret.list[0];
+       return true;
+}
 
-       if (!(impl->decl = locate_impl_decl(data->decls, ret))) {
-               data->error(PSI_WARNING, "Missing declaration for implementation %s",
-                               impl->func->name);
-               return 0;
-       }
-       if (!validate_set_value(data, ret->set, ret->decl)) {
-               return 0;
-       }
+static inline void psi_context_consts_init(struct psi_context *C)
+{
+       zend_constant zc;
 
-       return 1;
-}
-static inline int validate_impl_let_stmts(PSI_Data *data, impl *impl) {
-       size_t i, j;
-       /* we can have multiple let stmts */
-       /* check that we have a let stmt for every decl arg */
-       if (impl->decl->args) for (i = 0; i < impl->decl->args->count; ++i) {
-               decl_arg *darg = impl->decl->args->args[i];
-               int check = 0;
+       ZEND_CONSTANT_SET_FLAGS(&zc, CONST_CS|CONST_PERSISTENT, EG(current_module)->module_number);
 
-               for (j = 0; j < impl->stmts->let.count; ++j) {
-                       let_stmt *let = impl->stmts->let.list[j];
+       if (C->consts) {
+               size_t i = 0;
+               struct psi_const *c;
 
-                       if (!strcmp(let->var->name, darg->var->name)) {
-                               darg->let = let;
-                               check = 1;
-                               break;
+               while (psi_plist_get(C->consts, i++, &c)) {
+
+                       if (zend_get_constant(c->name)) {
+                               continue;
                        }
-               }
-               if (!check) {
-                       data->error(PSI_WARNING, "Missing `let` statement for arg '%s %.*s%s'"
-                                       " of declaration '%s' for implementation '%s'",
-                                       darg->type->name, (int) darg->var->pointer_level, "*****",
-                                       darg->var->name, impl->decl->func->var->name, impl->func->name);
-                       return 0;
+
+                       zc.name = zend_string_copy(c->name);
+                       psi_impl_def_val_get_zval(c->val, c->type ? c->type->type : PSI_T_MIXED, &zc.value);
+
+                       zend_register_constant(&zc);
                }
        }
-       /* check that the let_value references a known variable or NULL */
-       for (i = 0; i < impl->stmts->let.count; ++i) {
-               let_stmt *let = impl->stmts->let.list[i];
-               int check = 0;
+       if (C->enums) {
+               size_t i = 0;
+               struct psi_decl_enum *e;
 
-               if (let->val && let->val->func && let->val->func->alloc) {
-                       if (!validate_decl_type(data, let->val->func->alloc->type)) {
-                               data->error(PSI_WARNING, "Cannot use '%s' as type for calloc in `let` statement",
-                                       let->val->func->alloc->type->name);
-                               return 0;
-                       }
-               }
-               if (let->val && let->val->var) {
-                       if (impl->func->args) for (j = 0; j < impl->func->args->count; ++j) {
-                               impl_arg *iarg = impl->func->args->args[j];
-
-                               if (!strcmp(let->val->var->name, iarg->var->name)) {
-                                       let->arg = iarg;
-                                       check = 1;
-                                       break;
+               while (psi_plist_get(C->enums, i++, &e)) {
+                       size_t j = 0;
+                       struct psi_decl_enum_item *item;
+
+                       while (psi_plist_get(e->items, j++, &item)) {
+                               zend_string *name;
+
+                               if (psi_decl_type_is_anon(e->name, "enum")
+                                               || prefix_match(e->name, item->name)) {
+                                       name = strpprintf(0, "psi\\%s", item->name->val);
+                               } else {
+
+                                       name = strpprintf(0, "psi\\%s\\%s", e->name->val, item->name->val);
                                }
-                       }
-                       if (!check) {
-                               data->error(PSI_WARNING, "Unknown value '$%s' of `let` statement"
-                                               " for variable '%s' of implementation '%s'",
-                                               let->val->var->name, let->var->name, impl->func->name);
-                               return 0;
+
+                               if (zend_get_constant(name)) {
+                                       zend_string_release(name);
+                                       continue;
+                               }
+
+                               zc.name = zend_string_dup(name, 1);
+                               ZVAL_LONG(&zc.value, psi_num_exp_get_long(item->num, NULL, NULL));
+                               zend_register_constant(&zc);
+                               zend_string_release(name);
                        }
                }
        }
-       return 1;
 }
-static inline int validate_impl_set_stmts(PSI_Data *data, impl *impl) {
-       size_t i, j, k;
-       /* we can have any count of set stmts; processing out vars */
-       /* check that set stmts reference known variables */
-       for (i = 0; i < impl->stmts->set.count; ++i) {
-               set_stmt *set = impl->stmts->set.list[i];
-               int check = 0;
 
-               if (impl->func->args) for (j = 0; j < impl->func->args->count; ++j) {
-                       impl_arg *iarg = impl->func->args->args[j];
+static inline void psi_context_extvars_init(struct psi_context *C)
+{
+       if (C->vars) {
+               size_t v = 0;
+               struct psi_decl_extvar *evar;
 
-                       if (!strcmp(set->var->name, iarg->var->name)) {
-                               set->arg = iarg;
-                               check = 1;
-                               break;
-                       }
-               }
-               if (!check) {
-                       data->error(PSI_WARNING, "Unknown variable '$%s' of `set` statement"
-                                       " of implementation '%s'",
-                                       set->var->name, impl->func->name);
-                       return 0;
+               while (psi_plist_get(C->vars, v++, &evar)) {
+                       C->ops->extvar_init(C, evar);
                }
+       }
+}
 
-               for (j = 0; j < set->val->vars->count; ++j) {
-                       decl_var *set_var = set->val->vars->vars[j];
-
-                       check = 0;
-                       if (impl->decl->args) for (k = 0; k < impl->decl->args->count; ++k) {
-                               decl_arg *set_arg = impl->decl->args->args[k];
-
-                               if (!strcmp(set_var->name, set_arg->var->name)) {
-                                       check = 1;
-                                       if (!validate_set_value(data, set->val, set_arg)) {
-                                               return 0;
-                                       }
-                                       set_var->arg = set_arg;
-                                       break;
-                               }
-                       }
-
-                       if (!check) {
-                               data->error(PSI_WARNING, "Unknown value '%s' of `set` statement"
-                                               " for variable '$%s' of implementation '%s'",
-                                               set_var->name, set->arg->var->name, impl->func->name);
-                               return 0;
+static inline void psi_context_callback_init(struct psi_context *C,
+               struct psi_let_exp *let_exp, struct psi_impl *impl)
+{
+       struct psi_let_func *fn = let_exp->data.func;
+
+       switch (let_exp->kind) {
+       case PSI_LET_CALLBACK:
+               C->ops->cb_init(C, let_exp, impl);
+               /* override fn */
+               fn = let_exp->data.callback->func;
+               /* no break */
+       case PSI_LET_FUNC:
+               if (fn->inner) {
+                       size_t i = 0;
+                       struct psi_let_exp *inner_let;
+
+                       while (psi_plist_get(fn->inner, i++, &inner_let)) {
+                               psi_context_callback_init(C, inner_let, impl);
                        }
                }
+               break;
+       default:
+               break;
        }
-       return 1;
 }
-static inline decl *locate_free_decl(decls *decls, free_call *f) {
-       size_t i;
 
-       for (i = 0; i < decls->count; ++i) {
-               if (!strcmp(decls->list[i]->func->var->name, f->func)) {
-                       f->decl = decls->list[i];
-                       return decls->list[i];
+static inline void psi_context_callback_dtor(struct psi_context *C,
+               struct psi_let_exp *let_exp, struct psi_impl *impl)
+{
+       struct psi_let_func *fn = let_exp->data.func;
+
+       switch (let_exp->kind) {
+       case PSI_LET_CALLBACK:
+               C->ops->cb_dtor(C, let_exp, impl);
+               /* override func */
+               fn = let_exp->data.callback->func;
+               /* no break */
+       case PSI_LET_FUNC:
+               if (fn->inner) {
+                       size_t i = 0;
+                       struct psi_let_exp *cb;
+
+                       while (psi_plist_get(fn->inner, i++, &cb)) {
+                               psi_context_callback_dtor(C, cb, impl);
+                       }
                }
+               break;
+       default:
+               break;
        }
-       return NULL;
 }
-static inline int validate_impl_free_stmts(PSI_Data *data, impl *impl) {
-       size_t i, j, k, l;
-       /* we can have any count of free stmts; freeing any out vars */
-       for (i = 0; i < impl->stmts->fre.count; ++i) {
-               free_stmt *fre = impl->stmts->fre.list[i];
 
-               for (j = 0; j < fre->calls->count; ++j) {
-                       free_call *free_call = fre->calls->list[j];
+static inline void psi_context_impls_init(struct psi_context *C)
+{
+       size_t nf = 0;
+       zend_function_entry *zfe = NULL;
+
+       if (C->impls) {
+               size_t i = 0;
+               struct psi_impl *impl;
+
+               zfe = pecalloc(psi_plist_count(C->impls) + 1, sizeof(*zfe), 1);
+
+               while (psi_plist_get(C->impls, i++, &impl)) {
+                       zend_function_entry *zf = &zfe[nf];
+                       struct psi_let_stmt *let;
+                       size_t l = 0;
 
-                       /* first find the decl of the free func */
-                       if (!locate_free_decl(data->decls, free_call)) {
-                               data->error(PSI_WARNING, "Unknown function '%s' in `free` statement"
-                                               " of implementation '%s'", free_call->func, impl->func->name);
-                               return 0;
+                       if (!impl->decl) {
+                               continue;
                        }
-                       if (!impl->decl->args) {
-                               data->error(PSI_WARNING, "Declaration '%s' of implementation '%s'"
-                                               " does not have any arguments to free",
-                                               impl->decl->func->var->name, impl->func->name);
+                       if (!C->ops->decl_init(C, impl->decl)) {
+                               continue;
+                       }
+                       if (!C->ops->impl_init(C, impl, &zf->handler)) {
+                               continue;
+                       }
+                       while (psi_plist_get(impl->stmts.let, l++, &let)) {
+                               psi_context_callback_init(C, let->exp, impl);
                        }
 
-                       /* now check for known vars */
-                       for (l = 0; l < free_call->vars->count; ++l) {
-                               int check = 0;
-                               decl_var *free_var = free_call->vars->vars[l];
+                       zf->fname = impl->func->name->val + (impl->func->name->val[0] == '\\');
+                       zf->num_args = psi_plist_count(impl->func->args);
+                       zf->arg_info = psi_internal_arginfo(impl);
+                       ++nf;
+               }
+       }
 
-                               for (k = 0; k < impl->decl->args->count; ++k) {
-                                       decl_arg *free_arg = impl->decl->args->args[k];
+       C->closures = zfe;
+}
 
-                                       if (!strcmp(free_var->name, free_arg->var->name)) {
-                                               check = 1;
-                                               free_var->arg = free_arg;
-                                               break;
-                                       }
-                               }
+static inline void psi_context_decls_init(struct psi_context *C)
+{
+       if (C->decls) {
+               size_t d = 0;
+               struct psi_decl *decl;
 
-                               if (!check) {
-                                       data->error(PSI_WARNING, "Unknown variable '%s' of `free` statement"
-                                                       " of implementation '%s'",
-                                                       free_var->name, impl->func->name);
-                                       return 0;
-                               }
+               while (psi_plist_get(C->decls, d++, &decl)) {
+                       if (!decl->info) {
+                               C->ops->decl_init(C, decl);
                        }
                }
        }
-       return 1;
 }
-static inline int validate_impl_stmts(PSI_Data *data, impl *impl) {
-       if (!impl->stmts) {
-               data->error(PSI_WARNING, "Missing body for implementation %s!",
-                               impl->func->name);
-               return 0;
-       }
 
-       if (!validate_impl_ret_stmt(data, impl)) {
-               return 0;
-       }
+struct psi_struct_type_data {
+       struct psi_plist *els;
+       size_t offset;
+       size_t max_align;
+};
 
-       if (!validate_impl_let_stmts(data, impl)) {
-               return 0;
-       }
-       if (!validate_impl_set_stmts(data, impl)) {
-               return 0;
-       }
-       if (!validate_impl_free_stmts(data, impl)) {
-               return 0;
-       }
+static inline void psi_struct_type_pad(struct psi_context *C,
+               struct psi_struct_type_data *data, size_t padding)
+{
+       void *ele = C->ops->typeof_decl(C, PSI_T_INT8);
 
-       return 1;
+       while (padding--) {
+               void *pad = C->ops->copyof_type(C, ele);
+               data->els = psi_plist_add(data->els, &pad);
+       }
 }
 
-PSI_Context *PSI_ContextInit(PSI_Context *C, PSI_ContextOps *ops, PSI_ContextErrorFunc error)
+static inline void psi_struct_type_element(struct psi_context *C,
+               struct psi_struct_type_data *data, struct psi_decl_arg *darg)
 {
-       size_t i, j;
-       PSI_Data T;
+       void *type, *copy;
+       size_t i;
+       struct psi_layout type_layout;
 
-       if (!C) {
-               C = malloc(sizeof(*C));
+       if (darg->layout->pos) {
+               assert(data->offset <= darg->layout->pos);
+               psi_struct_type_pad(C, data, darg->layout->pos - data->offset);
+               data->offset = darg->layout->pos;
        }
-       memset(C, 0, sizeof(*C));
 
-       C->error = error;
-       C->ops = ops;
-       ops->init(C);
+       type = psi_context_decl_arg_full_type(C, darg);
+       C->ops->layoutof_type(C, type, &type_layout);
 
-       /* build up predefs in a temporary PSI_Data for validation */
-       memset(&T, 0, sizeof(T));
-       T.error = error;
+       if (type_layout.pos > data->max_align) {
+               data->max_align = type_layout.pos;
+       }
 
-       for (i = 0; i < psi_predef_type_count(); ++i) {
-               const psi_predef_type *pre = &psi_predef_types[i];
-               decl_type *type = init_decl_type(pre->type_tag, pre->type_name);
-               decl_typedef *def = init_decl_typedef(pre->alias, type);
+       assert(type_layout.len <= darg->layout->len);
 
-               T.defs = add_decl_typedef(T.defs, def);
+       for (i = 0; i < (darg->var->array_size ?: 1); ++i) {
+               copy = C->ops->copyof_type(C, type);
+               data->els = psi_plist_add(data->els, &copy);
        }
-       for (i = 0; i < psi_predef_const_count(); ++i) {
-               const psi_predef_const *pre = &psi_predef_consts[i];
-               impl_def_val *val = init_impl_def_val(pre->val_type_tag, pre->val_text);
-               const_type *type = init_const_type(pre->type_tag, pre->type_name);
-               constant *constant = init_constant(type, pre->name, val);
+       assert(darg->layout->len == type_layout.len * (darg->var->array_size ?: 1));
+       data->offset += darg->layout->len;
+}
 
-               T.consts = add_constant(T.consts, constant);
+static inline void psi_context_decl_struct_type_elements(struct psi_context *C,
+               struct psi_decl_struct *strct, struct psi_plist **els)
+{
+       size_t i = 0;
+       struct psi_decl_arg *darg, *prev = NULL;
+       struct psi_struct_type_data data = {0};
+
+       data.els = *els;
+       while (psi_plist_get(strct->args, i++, &darg)) {
+               if (prev && prev->layout->pos == darg->layout->pos) {
+                       /* skip bit fields */
+                       continue;
+               }
+               psi_struct_type_element(C, &data, darg);
        }
-       for (i = 0; i < psi_predef_struct_count(); ++i) {
-               const psi_predef_struct *pre = &psi_predef_structs[i];
-               decl_args *dargs = init_decl_args(NULL);
-               decl_struct *dstruct;
 
-               for (j = 0; j < PSI_PREDEF_STRUCT_MEMBERS; ++j) {
-                       const psi_predef_struct_member *member = &pre->members[j];
-                       decl_type *type;
-                       decl_var *dvar;
-                       decl_arg *darg;
+       data.offset = (data.offset + data.max_align - 1) & ~(data.max_align - 1);
+       assert(data.offset <= strct->size);
+       psi_struct_type_pad(C, &data, strct->size - data.offset);
 
-                       if (!member->name) {
-                               break;
-                       }
+       *els = data.els;
+}
 
-                       type = init_decl_type(member->type_tag, member->type_name);
-                       dvar = init_decl_var(member->name, member->pointer_level, member->array_size);
-                       darg = init_decl_arg(type, dvar);
-                       darg->layout = init_decl_struct_layout(member->off, member->len);
-                       dargs = add_decl_arg(dargs, darg);
-               }
+static inline void *psi_context_decl_arg_type(struct psi_context *C,
+               struct psi_decl_arg *darg)
+{
+       struct psi_decl_type *real = psi_decl_type_get_real(darg->type);
 
-               dstruct = init_decl_struct(pre->name, dargs);
-               dstruct->size = pre->size;
-               T.structs = add_decl_struct(T.structs, dstruct);
+       if (real != darg->type && darg->type->real.def->var->pointer_level) {
+               return C->ops->typeof_decl(C, PSI_T_POINTER);
        }
 
-       for (i = 0; i < psi_predef_type_count(); ++i) {
-               decl_typedef *def = T.defs->list[i];
+       if (real->type == PSI_T_UNION) {
+               struct psi_decl_arg *arg;
+               psi_plist_get(real->real.unn->args, 0, &arg);
+               return psi_context_decl_arg_full_type(C, arg);
+       }
 
-               if (validate_decl_typedef(&T, def)) {
-                       C->defs = add_decl_typedef(C->defs, def);
-               }
+       if (real->type == PSI_T_STRUCT) {
+               C->ops->composite_init(C, darg);
+               return darg->engine.type;
        }
 
-       for (i = 0; i < psi_predef_const_count(); ++i) {
-               constant *constant = T.consts->list[i];
+       return C->ops->typeof_decl(C, real->type);
+}
 
-               if (validate_constant(&T, constant)) {
-                       C->consts = add_constant(C->consts, constant);
-               }
+void *psi_context_decl_arg_call_type(struct psi_context *C,
+               struct psi_decl_arg *darg)
+{
+       if (darg->var->pointer_level) {
+               return C->ops->typeof_decl(C, PSI_T_POINTER);
        }
 
-       for (i = 0; i < psi_predef_struct_count(); ++i) {
-               decl_struct *dstruct = T.structs->list[i];
+       return psi_context_decl_arg_type(C, darg);
+}
 
-               if (validate_decl_struct(&T, dstruct)) {
-                       C->structs = add_decl_struct(C->structs, dstruct);
-               }
+void *psi_context_decl_arg_full_type(struct psi_context *C,
+               struct psi_decl_arg *darg)
+{
+       if (darg->var->array_size) {
+               C->ops->composite_init(C, darg);
+               return darg->engine.type;
+       }
+       if (darg->var->pointer_level) {
+               return C->ops->typeof_decl(C, PSI_T_POINTER);
        }
 
-       C->count = 1;
-       C->data = malloc(sizeof(*C->data));
-       PSI_DataExchange(C->data, &T);
-
-       return C;
+       return psi_context_decl_arg_type(C, darg);
 }
 
-int PSI_ContextValidate(PSI_Context *C, PSI_Parser *P)
+void **psi_context_composite_type_elements(struct psi_context *C,
+               struct psi_decl_arg *darg, struct psi_plist **eles)
 {
-       PSI_Data *D;
-       void *dlopened = NULL;
-       size_t count = C->count++;
+       struct psi_decl_type *dtype;
+       struct psi_decl_arg *tmp;
+       void *type, *copy;
 
-       C->data = realloc(C->data, C->count * sizeof(*C->data));
-       D = PSI_DataExchange(&C->data[count], PSI_DATA(P));
+       dtype = psi_decl_type_get_real(darg->type);
 
-       if (D->defs) {
-               size_t i;
-
-               for (i = 0; i < D->defs->count; ++i) {
-                       if (validate_decl_typedef(PSI_DATA(C), D->defs->list[i])) {
-                               C->defs = add_decl_typedef(C->defs, D->defs->list[i]);
-                       }
+       switch (dtype->type) {
+       case PSI_T_STRUCT:
+               psi_context_decl_struct_type_elements(C, dtype->real.strct, eles);
+               break;
+       case PSI_T_UNION:
+               if (psi_plist_bottom(dtype->real.unn->args, &tmp)) {
+                       type = psi_context_decl_arg_full_type(C, tmp);
+                       copy = C->ops->copyof_type(C, type);
+                       *eles = psi_plist_add(*eles, &copy);
                }
-       }
-       if (D->structs) {
-               size_t i;
-
-               for (i = 0; i < D->structs->count; ++i) {
-                       if (validate_decl_struct(PSI_DATA(C), D->structs->list[i])) {
-                               C->structs = add_decl_struct(C->structs, D->structs->list[i]);
-                       }
+               break;
+       default:
+               type = psi_context_decl_arg_type(C, darg);
+               for (size_t i = 0; i < darg->var->array_size; ++i) {
+                       copy = C->ops->copyof_type(C, type);
+                       *eles = psi_plist_add(*eles, &copy);
                }
        }
-       if (D->consts) {
-               size_t i;
 
-               for (i = 0; i < D->consts->count; ++i) {
-                       if (validate_constant(PSI_DATA(C), D->consts->list[i])) {
-                               C->consts = add_constant(C->consts, D->consts->list[i]);
-                       }
-               }
-       }
+       return psi_plist_eles(*eles);
+}
 
-       if (!validate_lib(D, &dlopened)) {
-               return 0;
+/*
+void psi_context_decl_func_array_elements(struct psi_context *C,
+               struct psi_decl *fn, struct psi_plist **els)
+{
+       void *type;
+       size_t i;
+
+       if (fn->func->var->pointer_level > 1) {
+               type = C->ops->typeof_decl(C, PSI_T_POINTER);
+       } else {
+               type = psi_context_decl_type(C, fn->func->type);
        }
 
-       add_decl_lib(&C->psi.libs, dlopened);
+       for (i = 0; i < fn->func->var->array_size; ++i) {
+               void *copy = C->ops->copyof_type(C, type);
+               *els = psi_plist_add(*els, &copy);
+       }
+}
 
-       if (D->decls) {
-               size_t i;
+void *psi_context_decl_func_type(struct psi_context *C, struct psi_decl *fn)
+{
+       struct psi_decl_arg *darg = fn->func;
 
-               for (i = 0; i < D->decls->count; ++i) {
-                       if (validate_decl(PSI_DATA(C), dlopened, D->decls->list[i])) {
-                               C->decls = add_decl(C->decls, D->decls->list[i]);
-                       }
-               }
+       if (darg->engine.type) {
+               return darg->engine.type;
        }
-       if (D->impls) {
-               size_t i;
 
-               for (i = 0; i < D->impls->count; ++i) {
-                       if (validate_impl_stmts(PSI_DATA(C), D->impls->list[i])) {
-                               C->impls = add_impl(C->impls, D->impls->list[i]);
-                       }
+       if (darg->var->pointer_level) {
+               if (!darg->var->array_size) {
+                       return C->ops->typeof_decl(C, PSI_T_POINTER);
+               } else {
+                       C->ops->composite_init(C, darg);
+                       return darg->engine.type;
                }
        }
 
-       return 1;
+       return psi_context_decl_type(C, darg->type);
 }
+*/
 
-static int psi_select_dirent(const struct dirent *entry)
+void psi_context_compile(struct psi_context *C)
 {
-#ifndef FNM_CASEFOLD
-#define FNM_CASEFOLD 0
-#endif
-       return 0 == fnmatch("*.psi", entry->d_name, FNM_CASEFOLD);
+       psi_context_consts_init(C);
+       psi_context_extvars_init(C);
+       psi_context_impls_init(C);
+       psi_context_decls_init(C);
+
+       /* zend_register_functions depends on EG(current_module) pointing into module */
+       EG(current_module) = zend_hash_str_find_ptr(&module_registry, "psi", sizeof("psi") - 1);
+       if (SUCCESS != zend_register_functions(NULL, C->closures, NULL, MODULE_PERSISTENT)) {
+               C->error(PSI_DATA(C), NULL, PSI_WARNING, "Failed to register functions!");
+       }
+       EG(current_module) = NULL;
 }
 
-void PSI_ContextBuild(PSI_Context *C, const char *path)
+ZEND_RESULT_CODE psi_context_call(struct psi_context *C, zend_execute_data *execute_data, zval *return_value, struct psi_impl *impl)
 {
-       int i, n;
-       struct dirent **entries = NULL;
+       struct psi_call_frame *frame;
 
-       n = php_scandir(path, &entries, psi_select_dirent, alphasort);
+       frame = psi_call_frame_init(C, impl->decl, impl);
 
-       if (n < 0) {
-               return;
-       } else for (i = 0; i < n; ++i) {
-               char psi[MAXPATHLEN];
-               PSI_Parser P;
-
-               if (MAXPATHLEN <= slprintf(psi, MAXPATHLEN, "%s/%s", path, entries[i]->d_name)) {
-                       C->error(PSI_WARNING, "Path to PSI file too long: %s/%s",
-                               path, entries[i]->d_name);
-               }
-               if (!PSI_ParserInit(&P, psi, C->error, 0)) {
-                       C->error(PSI_WARNING, "Failed to init PSI parser (%s): %s",
-                               psi, strerror(errno));
-                       continue;
-               }
+       if (SUCCESS != psi_call_frame_parse_args(frame, execute_data)) {
+               psi_call_frame_free(frame);
 
-               while (-1 != PSI_ParserScan(&P)) {
-                       PSI_ParserParse(&P, PSI_TokenAlloc(&P));
-               };
-               PSI_ParserParse(&P, NULL);
-               PSI_ContextValidate(C, &P);
-               PSI_ParserDtor(&P);
+               return FAILURE;
        }
 
-       if (PSI_ContextCompile(C) && SUCCESS != zend_register_functions(NULL, C->closures, NULL, MODULE_PERSISTENT)) {
-               C->error(PSI_WARNING, "Failed to register functions!");
-       }
+       psi_call_frame_enter(frame);
 
-       if (entries) {
-               for (i = 0; i < n; ++i) {
-                       free(entries[i]);
-               }
-               free(entries);
+       if (SUCCESS != psi_call_frame_do_let(frame)) {
+               psi_call_frame_do_return(frame, return_value);
+               psi_call_frame_free(frame);
+
+               return FAILURE;
        }
 
-}
+       if (SUCCESS != psi_call_frame_do_assert(frame, PSI_ASSERT_PRE)) {
+               psi_call_frame_do_return(frame, return_value);
+               psi_call_frame_free(frame);
 
-zend_function_entry *PSI_ContextCompile(PSI_Context *C)
-{
-       size_t i;
+               return FAILURE;
+       }
 
-       if (C->consts) {
-               zend_constant zc;
-
-               zc.flags = CONST_PERSISTENT|CONST_CS;
-               zc.module_number = EG(current_module)->module_number;
-
-               for (i = 0; i < C->consts->count; ++i) {
-                       constant *c = C->consts->list[i];
-
-                       zc.name = zend_string_init(c->name + (c->name[0] == '\\'), strlen(c->name) - (c->name[0] == '\\'), 1);
-                       ZVAL_NEW_STR(&zc.value, zend_string_init(c->val->text, strlen(c->val->text), 1));
-
-                       switch (c->type->type) {
-                       case PSI_T_BOOL:
-                               convert_to_boolean(&zc.value);
-                               break;
-                       case PSI_T_INT:
-                               convert_to_long(&zc.value);
-                               break;
-                       case PSI_T_FLOAT:
-                               convert_to_double(&zc.value);
-                               break;
-                       }
-                       zend_register_constant(&zc);
-               }
+       if (psi_call_frame_num_var_args(frame)) {
+               C->ops->call_va(frame);
+       } else {
+               C->ops->call(frame);
        }
 
+       if (SUCCESS != psi_call_frame_do_assert(frame, PSI_ASSERT_POST)) {
+               psi_call_frame_do_return(frame, return_value);
+               psi_call_frame_free(frame);
 
-       return C->closures = C->ops->compile(C);
-}
+               return FAILURE;
+       }
 
+       psi_call_frame_do_return(frame, return_value);
+       psi_call_frame_do_set(frame);
+       psi_call_frame_do_free(frame);
+       psi_call_frame_free(frame);
 
-void PSI_ContextCall(PSI_Context *C, impl_val *ret_val, decl *decl, impl_val **args)
-{
-       C->ops->call(C, ret_val, decl, args);
+       return SUCCESS;
 }
 
-void PSI_ContextDtor(PSI_Context *C)
+
+void psi_context_dtor(struct psi_context *C)
 {
        size_t i;
+       zend_function_entry *zfe;
 
-       C->ops->dtor(C);
+       if (C->decls) {
+               size_t i = 0;
+               struct psi_decl *decl;
 
-       free_decl_libs(&C->psi.libs);
+               while (psi_plist_get(C->decls, i++, &decl)) {
+                       size_t j = 0;
+                       struct psi_decl_arg *darg;
 
-       for (i = 0; i < C->count; ++i) {
-               PSI_DataDtor(&C->data[i]);
-       }
+                       while (psi_plist_get(decl->args, j++, &darg)) {
+                               C->ops->composite_dtor(C, darg);
+                       }
+                       C->ops->composite_dtor(C, decl->func);
+                       C->ops->decl_dtor(C, decl);
+               }
 
-       free(C->data);
-       free(C->closures);
+       }
+       if (C->vars) {
+               size_t i = 0;
+               struct psi_decl_extvar *evar;
 
-       if (C->consts) {
-               if (C->consts->list) {
-                       free(C->consts->list);
+               while (psi_plist_get(C->vars, i++, &evar)) {
+                       C->ops->composite_dtor(C, evar->getter->func);
+                       C->ops->composite_dtor(C, evar->arg);
+                       C->ops->extvar_dtor(C, evar);
                }
-               free(C->consts);
        }
-       if (C->defs) {
-               if (C->defs->list) {
-                       free(C->defs->list);
+       if (C->impls) {
+               size_t i = 0;
+               struct psi_impl *impl;
+
+               while (psi_plist_get(C->impls, i++, &impl)) {
+                       struct psi_let_stmt *let;
+                       size_t j = 0;
+
+                       while (psi_plist_get(impl->stmts.let, j++, &let)) {
+                               psi_context_callback_dtor(C, let->exp, impl);
+                       }
+
+                       C->ops->impl_dtor(C, impl);
                }
-               free(C->defs);
        }
-       if (C->structs) {
-               if (C->structs->list) {
-                       free(C->structs->list);
-               }
-               free(C->structs);
+
+       if (C->ops->dtor) {
+               C->ops->dtor(C);
        }
-       if (C->decls) {
-               if (C->decls->list) {
-                       free(C->decls->list);
+
+       psi_data_dtor(PSI_DATA(C));
+
+       if (C->data) {
+               for (i = 0; i < C->count; ++i) {
+                       psi_data_dtor(&C->data[i]);
                }
-               free(C->decls);
+               free(C->data);
        }
-       if (C->impls) {
-               if (C->impls->list) {
-                       free(C->impls->list);
+
+       if (C->closures) {
+               for (zfe = C->closures; zfe->fname; ++zfe) {
+                       pefree((void *) zfe->arg_info, 1);
                }
-               free(C->impls);
+               pefree(C->closures, 1);
        }
-
-       memset(C, 0, sizeof(*C));
 }
 
-void PSI_ContextFree(PSI_Context **C)
+void psi_context_free(struct psi_context **C)
 {
        if (*C) {
-               PSI_ContextDtor(*C);
+               psi_context_dtor(*C);
                free(*C);
                *C = NULL;
        }
 }
+
+void psi_context_dump(struct psi_dump *dump, struct psi_context *C)
+{
+       PSI_DUMP(dump, "// psi.engine=%s\n// %lu files\n",
+                       C->ops->name, C->count);
+
+       psi_data_dump(dump, PSI_DATA(C));
+
+#if 0
+       if (C->flags & PSI_DEBUG) {
+               size_t i;
+
+               for (i = 0; i < C->count; ++i) {
+                       psi_data_dump(dump, &C->data[i]);
+               }
+       }
+#endif
+}