flush
[m6w6/ext-psi] / src / context.c
index 83a1a28f34b03f26842d89708972ea4f73fdd007..1a20af9decd4b57e97757670ea9b881af33b4c62 100644 (file)
-#include <sys/param.h>
-#include <dlfcn.h>
-#include <dirent.h>
-#include <fnmatch.h>
-#include <errno.h>
-
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
+#include "php.h"
+
+#include <stdio.h>
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#ifdef STDC_HEADERS
+# include <stdlib.h>
+# include <stddef.h>
+#else
+# ifdef HAVE_STDLIB_H
+#  include <stdlib.h>
+# endif
+#endif
+#ifdef HAVE_STRING_H
+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
+#  include <memory.h>
+# endif
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#ifdef HAVE_INTTYPES_H
+# include <inttypes.h>
+#endif
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
+#ifdef HAVE_ERRNO_H
+# include <errno.h>
+#endif
+#ifdef HAVE_GLOB_H
+# include <glob.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+# include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+# include <arpa/nameser.h>
+#endif
+#ifdef HAVE_NETDB_H
+# include <netdb.h>
+#endif
+#ifdef HAVE_RESOLV_H
+# include <resolv.h>
+#endif
+#ifdef HAVE_SYS_SELECT_H
+# include <sys/select.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+# include <sys/socket.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+#ifdef HAVE_SYS_TIMES_H
+# include <sys/times.h>
+#endif
+#ifdef HAVE_SYS_UIO_H
+# include <sys/uio.h>
+#endif
+#ifdef HAVE_SYS_UTSNAME_H
+# include <sys/utsname.h>
+#endif
+#ifdef HAVE_TIME_H
+# include <time.h>
+#endif
+#ifdef HAVE_WCHAR_H
+# include <wchar.h>
+#endif
+
+#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 <sys/param.h>
+#include <dlfcn.h>
+#include <fnmatch.h>
+
 #include "php.h"
 #include "php_scandir.h"
 #include "php_psi.h"
 #include "context.h"
 #include "parser.h"
 
-#define psi_predef_count(of) ((sizeof(psi_predef ##of## s)/sizeof(psi_predef ##of))-1)
-typedef struct psi_predef_type {
+#include "libjit.h"
+#include "libffi.h"
+
+static struct psi_std_type {
+       token_t type_tag;
+       const char *type_name;
+} psi_std_types[] = {
+       {PSI_T_FLOAT, "float"},
+       {PSI_T_DOUBLE, "double"},
+       {PSI_T_INT8, "int8_t"},
+       {PSI_T_INT16, "int16_t"},
+       {PSI_T_INT32, "int32_t"},
+       {PSI_T_INT64, "int64_t"},
+       {PSI_T_UINT8, "uint8_t"},
+       {PSI_T_UINT16, "uint16_t"},
+       {PSI_T_UINT32, "uint32_t"},
+       {PSI_T_UINT64, "uint64_t"},
+       {0}
+};
+
+static 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}
+} psi_predef_types[] = {
+       PSI_TYPES
+       {0}
 };
-#define psi_predef_type_count() psi_predef_count(_type)
 
-typedef struct psi_predef_const {
+static struct psi_predef_const {
        token_t type_tag;
        const char *type_name;
-       const char *name;
+       const char *var_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}
+} psi_predef_consts[] = {
+       PSI_CONSTS
+       {0}
+};
+
+PSI_MACROS
+
+size_t psi_fread(void *ptr, size_t size, size_t nmemb, FILE *stream)
+{
+       size_t rv = fread(ptr, size, nmemb, stream);
+       return rv;
+}
+
+FILE *psi_fopen(const char *path, const char *mode)
+{
+       FILE *f = fopen(path, mode);
+       return f;
+}
+
+static struct psi_func_redir {
+       const char *name;
+       void (*func)(void);
+} psi_func_redirs[] = {
+               {"fopen", (void (*)(void)) psi_fopen},
+               {"fread", (void (*)(void)) psi_fread},
+       PSI_REDIRS
+       {0}
 };
-#define psi_predef_const_count() psi_predef_count(_const)
 
-typedef struct psi_predef_struct_member {
+static struct psi_predef_decl {
        token_t type_tag;
        const char *type_name;
-       const char *name;
-       size_t off;
-       size_t len;
+       const char *var_name;
        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;
+} psi_predef_decls[] = {
+       PSI_DECLS
+       {0}
+};
+
+static struct psi_predef_struct {
+       token_t type_tag;
+       const char *type_name;
+       const char *var_name;
+       size_t offset;
        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}
+       size_t pointer_level;
+       size_t array_size;
+} psi_predef_structs[] = {
+       PSI_STRUCTS
+       {0}
 };
-#define psi_predef_struct_count() psi_predef_count(_struct)
 
 static int validate_lib(PSI_Data *data, void **dlopened) {
        char lib[MAXPATHLEN];
@@ -66,11 +205,7 @@ static int validate_lib(PSI_Data *data, void **dlopened) {
                /* FIXME: assume stdlib */
                return 1;
        } else if (!strchr(ptr, '/')) {
-#ifdef DARWIN
-               len = snprintf(lib, MAXPATHLEN, "lib%s.dylib", ptr);
-#else
-               len = snprintf(lib, MAXPATHLEN, "lib%s.so", ptr);
-#endif
+               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);
                }
@@ -87,16 +222,26 @@ static int validate_lib(PSI_Data *data, void **dlopened) {
 
 static inline int locate_decl_type_alias(decl_typedefs *defs, decl_type *type) {
        size_t i;
+       struct psi_std_type *stdtyp;
 
        if (type->real) {
                return 1;
        }
        for (i = 0; i < defs->count; ++i) {
-               if (!strcmp(defs->list[i]->alias, type->name)) {
-                       type->real = defs->list[i]->type;
+               decl_typedef *def = defs->list[i];
+
+               if (def->type->type != type->type && !strcmp(def->alias, type->name)) {
+                       type->real = def->type;
                        return 1;
                }
        }
+       for (stdtyp = &psi_std_types[0]; stdtyp->type_tag; ++stdtyp) {
+               if (!strcmp(type->name, stdtyp->type_name)) {
+                       type->type = stdtyp->type_tag;
+                       return 1;
+               }
+       }
+
        return 0;
 }
 static inline int locate_decl_type_struct(decl_structs *structs, decl_type *type) {
@@ -120,7 +265,10 @@ static inline int validate_decl_type(PSI_Data *data, decl_type *type) {
                if (!data->defs || !locate_decl_type_alias(data->defs, type)) {
                        return 0;
                }
-               return validate_decl_type(data, type->real);
+               if (type->real) {
+                       return validate_decl_type(data, type->real);
+               }
+               return 1;
        case PSI_T_STRUCT:
                if (!data->structs || !locate_decl_type_struct(data->structs, type)) {
                        return 0;
@@ -131,8 +279,8 @@ static inline int validate_decl_type(PSI_Data *data, decl_type *type) {
 }
 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);
+               data->error(PSI_WARNING, "Type '%s' cannot be aliased to %s'%s'",
+                       def->type->name, def->type->type == PSI_T_STRUCT?"struct ":"",def->alias);
                return 0;
        }
        /* FIXME: check def->alias */
@@ -146,8 +294,8 @@ static inline int validate_constant(PSI_Data *data, constant *c) {
 
 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);
+               data->error(PSI_WARNING, "Cannot use '%s'(%d) as type for '%s'",
+                       arg->type->name, arg->type->type, arg->var->name);
                return 0;
        }
        return 1;
@@ -169,7 +317,7 @@ static inline int validate_decl_struct(PSI_Data *data, decl_struct *s) {
                        return 0;
                }
 
-               ZEND_ASSERT(!darg->var->arg);
+               ZEND_ASSERT(!darg->var->arg || darg->var->arg == darg);
                darg->var->arg = darg;
 
                if (!darg->layout) {
@@ -217,6 +365,8 @@ static inline int validate_decl_abi(PSI_Data *data, decl_abi *abi) {
 }
 static inline int validate_decl_func(PSI_Data *data, void *dl, decl *decl, decl_arg *func)
 {
+       struct psi_func_redir *redir;
+
        if (!strcmp(func->var->name, "dlsym")) {
                data->error(PSI_WARNING, "Cannot dlsym dlsym (sic!)");
                return 0;
@@ -225,13 +375,20 @@ static inline int validate_decl_func(PSI_Data *data, void *dl, decl *decl, decl_
        if (!validate_decl_arg(data, func)) {
                return 0;
        }
+       for (redir = &psi_func_redirs[0]; redir->name; ++redir) {
+               if (!strcmp(func->var->name, redir->name)) {
+                       decl->call.sym = redir->func;
+               }
+       }
+       if (!decl->call.sym) {
 #ifndef RTLD_NEXT
 # define RTLD_NEXT ((void *) -1l)
 #endif
-       decl->dlptr = dlsym(dl ?: RTLD_NEXT, func->var->name);
-       if (!decl->dlptr) {
-               data->error(PSI_WARNING, "Failed to locate symbol '%s': %s",
-                       func->var->name, dlerror());
+               decl->call.sym = dlsym(dl ?: RTLD_NEXT, func->var->name);
+               if (!decl->call.sym) {
+                       data->error(PSI_WARNING, "Failed to locate symbol '%s': %s",
+                               func->var->name, dlerror());
+               }
        }
        return 1;
 }
@@ -254,19 +411,232 @@ static inline int validate_decl(PSI_Data *data, void *dl, decl *decl) {
        }
        return 1;
 }
+static inline decl_arg *locate_decl_var_arg(decl_var *var, decl_args *args, decl_arg *func) {
+       size_t i;
 
-static inline decl *locate_impl_decl(decls *decls, return_stmt *ret) {
+       for (i = 0; i < args->count; ++i) {
+               decl_arg *arg = args->args[i];
+
+               if (!strcmp(var->name, arg->var->name)) {
+                       ZEND_ASSERT(!var->arg || var->arg == arg);
+                       return var->arg = arg;
+               }
+       }
+       if (func && !strcmp(var->name, func->var->name)) {
+               return var->arg = func;
+       }
+
+       return NULL;
+}
+static inline decl_arg *locate_struct_member(decl_struct *s, decl_var *var) {
+       if (s->args) {
+               return locate_decl_var_arg(var, s->args, NULL);
+       }
+
+       return NULL;
+}
+static inline constant *locate_num_exp_constant(num_exp *exp, constants *consts) {
        size_t i;
 
-       for (i = 0; i < decls->count; ++i) {
-               if (!strcmp(decls->list[i]->func->var->name, ret->decl->name)) {
-                       ret->decl->arg = decls->list[i]->func;
-                       return decls->list[i];
+       for (i = 0; i < consts->count; ++i) {
+               constant *cnst = consts->list[i];
+
+               if (!strcmp(cnst->name, exp->u.numb)) {
+                       free(exp->u.numb);
+                       return exp->u.cnst = cnst;
+               }
+       }
+
+       return NULL;
+}
+static inline int validate_num_exp(PSI_Data *data, decl_args *dargs, decl_arg *func, num_exp *exp) {
+       if (exp->operand) {
+               switch (exp->operator) {
+               case PSI_T_PLUS:
+                       exp->calculator = psi_calc_add;
+                       break;
+               case PSI_T_MINUS:
+                       exp->calculator = psi_calc_sub;
+                       break;
+               case PSI_T_ASTERISK:
+                       exp->calculator = psi_calc_mul;
+                       break;
+               case PSI_T_SLASH:
+                       exp->calculator = psi_calc_div;
+                       break;
+               EMPTY_SWITCH_DEFAULT_CASE();
+               }
+               if (!validate_num_exp(data, dargs, func, exp->operand)) {
+                       return 0;
+               }
+       }
+       switch (exp->t) {
+       case PSI_T_NAME:
+               if (!locate_decl_var_arg(exp->u.dvar, dargs, func)) {
+                       data->error(PSI_WARNING, "Unknown variable '%s' in numeric expression",
+                                       exp->u.dvar->name);
+                       return 0;
+               }
+               return 1;
+       case PSI_T_NSNAME:
+               if (!locate_num_exp_constant(exp, data->consts)) {
+                       data->error(PSI_WARNING, "Unknown constant '%s' in numeric expression",
+                                       exp->u.numb);
+                       return 0;
+               }
+               return 1;
+       case PSI_T_NUMBER:
+               return 1;
+       default:
+               return 0;
+       }
+}
+static inline int validate_set_value_handler(set_value *set) {
+       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;
+       case PSI_T_TO_OBJECT:
+               set->func->handler = psi_to_object;
+               break;
+       case PSI_T_VOID:
+               set->func->handler = psi_to_void;
+               break;
+       default:
+               return 0;
+       }
+       return 1;
+}
+static inline void decl_var_arg_v(decl_args *args, va_list argp) {
+       int argc;
+       decl_arg **argv;
+
+       memset(args, 0, sizeof(*args));
+
+       while ((argc = va_arg(argp, int))) {
+               argv = va_arg(argp, decl_arg **);
+               while (argc--) {
+                       add_decl_arg(args, *argv++);
+               }
+       }
+}
+static inline int validate_set_value_ex(PSI_Data *data, set_value *set, decl_arg *ref, decl_args *ref_list) {
+       size_t i;
+       decl_type *ref_type;
+       decl_var *set_var = set->vars->vars[0];
+
+       if (!validate_set_value_handler(set)) {
+               data->error(PSI_WARNING, "Invalid cast '%s'", set->func->name);
+               return 0;
+       }
+
+       for (i = 0; i < set->vars->count; ++i) {
+               if (!locate_decl_var_arg(set->vars->vars[i], ref_list, NULL)) {
+                       data->error(PSI_WARNING, "Unknown variable '%s'", set->vars->vars[i]->name);
+                       return 0;
+               }
+       }
+
+       if (!ref) {
+               ref = set_var->arg;
+       }
+       ref_type = real_decl_type(ref->type);
+
+       if (set->count) {
+               int is_to_array = (set->func->type == PSI_T_TO_ARRAY);
+               int is_pointer_to_struct = (ref_type->type == PSI_T_STRUCT && ref->var->pointer_level);
+
+               if (!is_to_array && !is_pointer_to_struct) {
+                       data->error(E_WARNING, "Inner `set` statement casts only work with "
+                                       "to_array() casts on structs or pointers: %s(%s...", set->func->name, set->vars->vars[0]->name);
+                       return 0;
+               }
+       }
+       if (set->num) {
+               if (!validate_num_exp(data, ref_list, ref, set->num)) {
+                       return 0;
+               }
+       }
+
+       if (ref_type->type == PSI_T_STRUCT) {
+               /* to_array(struct, to_...) */
+               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);
+
+                       set->inner[i]->outer.set = set;
+                       if (sub_ref) {
+                               if (!validate_set_value_ex(data, set->inner[i], sub_ref, ref_type->strct->args)) {
+                                       return 0;
+                               }
+                       }
+               }
+       } else if (set->count == 1) {
+               /* to_array(ptr, to_string(*ptr)) */
+               decl_var *sub_var = set->inner[0]->vars->vars[0];
+               decl_arg *sub_ref = locate_decl_var_arg(sub_var, ref_list, ref);
+
+               set->inner[0]->outer.set = set;
+               if (sub_ref) {
+                       if (strcmp(sub_var->name, set_var->name)) {
+                               data->error(E_WARNING, "Inner `set` statement casts on pointers must reference the same variable");
+                               return 0;
+                       }
+                       if (!validate_set_value_ex(data, set->inner[0], sub_ref, ref_list)) {
+                               return 0;
+                       }
+               }
+       } else if (set->count > 1) {
+               data->error(E_WARNING, "Inner `set` statement casts on pointers may only occur once");
+               return 0;
+       }
+
+       return 1;
+}
+static inline int validate_set_value(PSI_Data *data, set_value *set, ...) {
+       va_list argp;
+       decl_args args = {0};
+       int check;
+
+       va_start(argp, set);
+       decl_var_arg_v(&args, argp);
+       va_end(argp);
+
+       check = validate_set_value_ex(data, set, NULL, &args);
+       if (args.args) {
+               free(args.args);
+       }
+       return check;
+}
+static inline decl *locate_impl_decl(decls *decls, return_stmt *ret) {
+       if (decls) {
+               size_t i;
+
+               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];
+                       }
                }
        }
+
        return NULL;
 }
 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) {
@@ -280,17 +650,38 @@ static inline int validate_impl_ret_stmt(PSI_Data *data, impl *impl) {
                }
                return 0;
        }
-       if (!(impl->decl = locate_impl_decl(data->decls, impl->stmts->ret.list[0]))) {
+
+       ret = impl->stmts->ret.list[0];
+
+       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, 1, &ret->decl, impl->decl->args ? (int) impl->decl->args->count : 0, impl->decl->args ? impl->decl->args->args : NULL, 0)) {
+               return 0;
+       }
+
+       impl->decl->impl = impl;
+
        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 decl arg for every let stmt */
+       for (i = 0; i < impl->stmts->let.count; ++i) {
+               let_stmt *let = impl->stmts->let.list[i];
+
+               if (!locate_decl_var_arg(let->var, impl->decl->args, impl->decl->func)) {
+                       data->error(PSI_WARNING, "Unknown variable '%s' in `let` statement"
+                                       " of implementation '%s'", let->var->name, impl->func->name);
+                       return 0;
+               }
+       }
+
        /* 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];
@@ -319,9 +710,10 @@ static inline int validate_impl_let_stmts(PSI_Data *data, impl *impl) {
                int check = 0;
 
                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);
+                       if (!validate_num_exp(data, impl->decl->args, impl->decl->func, let->val->func->alloc->nmemb)) {
+                               return 0;
+                       }
+                       if (!validate_num_exp(data, impl->decl->args, impl->decl->func, let->val->func->alloc->size)) {
                                return 0;
                        }
                }
@@ -379,6 +771,9 @@ static inline int validate_impl_set_stmts(PSI_Data *data, impl *impl) {
                                if (!strcmp(set_var->name, set_arg->var->name)) {
                                        check = 1;
                                        set_var->arg = set_arg;
+                                       if (!validate_set_value(data, set->val, 1, &set_arg, 1, &impl->decl->func, impl->decl->args->count, impl->decl->args->args, 0)) {
+                                               return 0;
+                                       }
                                        break;
                                }
                        }
@@ -393,34 +788,62 @@ static inline int validate_impl_set_stmts(PSI_Data *data, impl *impl) {
        }
        return 1;
 }
+static inline decl *locate_free_decl(decls *decls, free_call *f) {
+       if (decls)  {
+               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];
+                       }
+               }
+       }
+
+       return NULL;
+}
 static inline int validate_impl_free_stmts(PSI_Data *data, impl *impl) {
-       size_t i, j, k;
+       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->vars->count; ++j) {
-                       decl_var *free_var = fre->vars->vars[j];
-                       int check = 0;
+               for (j = 0; j < fre->calls->count; ++j) {
+                       free_call *free_call = fre->calls->list[j];
 
-                       if (!strcmp(free_var->name, impl->decl->func->var->name)) {
-                               continue;
+                       /* 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->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 (impl->decl->args) for (k = 0; k < impl->decl->args->count; ++k) {
-                               decl_arg *free_arg = impl->decl->args->args[k];
 
-                               if (!strcmp(free_var->name, free_arg->var->name)) {
-                                       check = 1;
-                                       free_var->arg = free_arg;
-                                       break;
+                       /* 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];
+
+                               for (k = 0; k < impl->decl->args->count; ++k) {
+                                       decl_arg *free_arg = impl->decl->args->args[k];
+
+                                       if (!strcmp(free_var->name, free_arg->var->name)) {
+                                               check = 1;
+                                               free_var->arg = free_arg;
+                                               break;
+                                       }
                                }
-                       }
 
-                       if (!check) {
-                               data->error(PSI_WARNING, "Unknown variable '%s' of `free` statement"
-                                               " of implementation '%s'",
-                                               free_var->name, impl->func->name);
-                               return 0;
+                               if (!check) {
+                                       data->error(PSI_WARNING, "Unknown variable '%s' of `free` statement"
+                                                       " of implementation '%s'",
+                                                       free_var->name, impl->func->name);
+                                       return 0;
+                               }
                        }
                }
        }
@@ -452,8 +875,12 @@ static inline int validate_impl_stmts(PSI_Data *data, impl *impl) {
 
 PSI_Context *PSI_ContextInit(PSI_Context *C, PSI_ContextOps *ops, PSI_ContextErrorFunc error)
 {
-       size_t i, j;
+       size_t i;
        PSI_Data T;
+       struct psi_predef_type *predef_type;
+       struct psi_predef_const *predef_const;
+       struct psi_predef_struct *predef_struct;
+       struct psi_predef_decl *predef_decl;
 
        if (!C) {
                C = malloc(sizeof(*C));
@@ -462,55 +889,73 @@ PSI_Context *PSI_ContextInit(PSI_Context *C, PSI_ContextOps *ops, PSI_ContextErr
 
        C->error = error;
        C->ops = ops;
-       ops->init(C);
+
+       if (ops->init) {
+               ops->init(C);
+       }
+
+       ZEND_ASSERT(ops->call != NULL);
+       ZEND_ASSERT(ops->compile != NULL);
 
        /* build up predefs in a temporary PSI_Data for validation */
        memset(&T, 0, sizeof(T));
        T.error = error;
 
-       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);
+       for (predef_type = &psi_predef_types[0]; predef_type->type_tag; ++predef_type) {
+               decl_type *type = init_decl_type(predef_type->type_tag, predef_type->type_name);
+               decl_typedef *def = init_decl_typedef(predef_type->alias, type);
 
                T.defs = add_decl_typedef(T.defs, def);
        }
-       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);
+       for (predef_const = &psi_predef_consts[0]; predef_const->type_tag; ++predef_const) {
+               impl_def_val *val = init_impl_def_val(predef_const->val_type_tag, predef_const->val_text);
+               const_type *type = init_const_type(predef_const->type_tag, predef_const->type_name);
+               constant *constant = init_constant(type, predef_const->var_name, val);
 
                T.consts = add_constant(T.consts, constant);
        }
-       for (i = 0; i < psi_predef_struct_count(); ++i) {
-               const psi_predef_struct *pre = &psi_predef_structs[i];
+       for (predef_struct = &psi_predef_structs[0]; predef_struct->type_tag; ++predef_struct) {
+               struct psi_predef_struct *member;
                decl_args *dargs = init_decl_args(NULL);
-               decl_struct *dstruct;
+               decl_struct *dstruct = init_decl_struct(predef_struct->var_name, dargs);
 
-               for (j = 0; j < PSI_PREDEF_STRUCT_MEMBERS; ++j) {
-                       const psi_predef_struct_member *member = &pre->members[j];
+               dstruct->size = predef_struct->size;
+               for (member = &predef_struct[1]; member->type_tag; ++member) {
                        decl_type *type;
                        decl_var *dvar;
                        decl_arg *darg;
 
-                       if (!member->name) {
-                               break;
-                       }
-
                        type = init_decl_type(member->type_tag, member->type_name);
-                       dvar = init_decl_var(member->name, member->pointer_level, member->array_size);
+                       dvar = init_decl_var(member->var_name, member->pointer_level, member->array_size);
                        darg = init_decl_arg(type, dvar);
-                       darg->layout = init_decl_struct_layout(member->off, member->len);
+                       darg->layout = init_decl_struct_layout(member->offset, member->size);
                        dargs = add_decl_arg(dargs, darg);
                }
 
-               dstruct = init_decl_struct(pre->name, dargs);
-               dstruct->size = pre->size;
                T.structs = add_decl_struct(T.structs, dstruct);
+               predef_struct = member;
+       }
+       for (predef_decl = &psi_predef_decls[0]; predef_decl->type_tag; ++predef_decl) {
+               struct psi_predef_decl *farg;
+               decl_type *ftype = init_decl_type(predef_decl->type_tag, predef_decl->type_name);
+               decl_var *fname = init_decl_var(predef_decl->var_name, predef_decl->pointer_level, predef_decl->array_size);
+               decl_arg *func = init_decl_arg(ftype, fname);
+               decl_args *args = init_decl_args(NULL);
+               decl *decl = init_decl(init_decl_abi("default"), func, args);
+
+
+               for (farg = &predef_decl[1]; farg->type_tag; ++farg) {
+                       decl_type *arg_type = init_decl_type(farg->type_tag, farg->type_name);
+                       decl_var *arg_var = init_decl_var(farg->var_name, farg->pointer_level, farg->array_size);
+                       decl_arg *darg = init_decl_arg(arg_type, arg_var);
+                       args = add_decl_arg(args, darg);
+               }
+
+               T.decls = add_decl(T.decls, decl);
+               predef_decl = farg;
        }
 
-       for (i = 0; i < psi_predef_type_count(); ++i) {
+       for (i = 0; i < T.defs->count; ++i) {
                decl_typedef *def = T.defs->list[i];
 
                if (validate_decl_typedef(&T, def)) {
@@ -518,7 +963,7 @@ PSI_Context *PSI_ContextInit(PSI_Context *C, PSI_ContextOps *ops, PSI_ContextErr
                }
        }
 
-       for (i = 0; i < psi_predef_const_count(); ++i) {
+       for (i = 0; i < T.consts->count; ++i) {
                constant *constant = T.consts->list[i];
 
                if (validate_constant(&T, constant)) {
@@ -526,7 +971,7 @@ PSI_Context *PSI_ContextInit(PSI_Context *C, PSI_ContextOps *ops, PSI_ContextErr
                }
        }
 
-       for (i = 0; i < psi_predef_struct_count(); ++i) {
+       for (i = 0; i < T.structs->count; ++i) {
                decl_struct *dstruct = T.structs->list[i];
 
                if (validate_decl_struct(&T, dstruct)) {
@@ -534,6 +979,14 @@ PSI_Context *PSI_ContextInit(PSI_Context *C, PSI_ContextOps *ops, PSI_ContextErr
                }
        }
 
+       for (i = 0; i < T.decls->count; ++i) {
+               decl *decl = T.decls->list[i];
+
+               if (validate_decl(&T, NULL, decl)) {
+                       C->decls = add_decl(C->decls, decl);
+               }
+       }
+
        C->count = 1;
        C->data = malloc(sizeof(*C->data));
        PSI_DataExchange(C->data, &T);
@@ -614,47 +1067,66 @@ static int psi_select_dirent(const struct dirent *entry)
        return 0 == fnmatch("*.psi", entry->d_name, FNM_CASEFOLD);
 }
 
-void PSI_ContextBuild(PSI_Context *C, const char *path)
+void PSI_ContextBuild(PSI_Context *C, const char *paths)
 {
-       int i, n;
+       int i, n, flags = psi_check_env("PSI_DEBUG") ? PSI_PARSER_DEBUG : 0;
+       char *sep = NULL, *cpy = strdup(paths), *ptr = cpy;
        struct dirent **entries = NULL;
 
-       n = php_scandir(path, &entries, psi_select_dirent, alphasort);
 
-       if (n < 0) {
-               return;
-       } else for (i = 0; i < n; ++i) {
-               char psi[MAXPATHLEN];
-               PSI_Parser P;
+       do {
+               sep = strchr(ptr, ':');
 
-               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 (sep) {
+                       *sep = 0;
                }
-               if (!PSI_ParserInit(&P, psi, C->error, 0)) {
-                       C->error(PSI_WARNING, "Failed to init PSI parser (%s): %s",
-                               psi, strerror(errno));
-                       continue;
+
+               n = php_scandir(ptr, &entries, psi_select_dirent, alphasort);
+
+               if (n > 0) {
+                       for (i = 0; i < n; ++i) {
+                               char psi[MAXPATHLEN];
+                               PSI_Parser P;
+
+                               if (MAXPATHLEN <= slprintf(psi, MAXPATHLEN, "%s/%s", ptr, entries[i]->d_name)) {
+                                       C->error(PSI_WARNING, "Path to PSI file too long: %s/%s",
+                                               ptr, entries[i]->d_name);
+                               }
+                               if (!PSI_ParserInit(&P, psi, C->error, flags)) {
+                                       C->error(PSI_WARNING, "Failed to init PSI parser (%s): %s",
+                                               psi, strerror(errno));
+                                       continue;
+                               }
+
+                               while (0 < PSI_ParserScan(&P)) {
+                                       PSI_ParserParse(&P, PSI_TokenAlloc(&P));
+                                       if (P.num == PSI_T_EOF) {
+                                               break;
+                                       }
+                               }
+
+                               PSI_ParserParse(&P, NULL);
+                               PSI_ContextValidate(C, &P);
+                               PSI_ParserDtor(&P);
+                       }
                }
 
-               while (-1 != PSI_ParserScan(&P)) {
-                       PSI_ParserParse(&P, PSI_TokenAlloc(&P));
-               };
-               PSI_ParserParse(&P, NULL);
-               PSI_ContextValidate(C, &P);
-               PSI_ParserDtor(&P);
-       }
+               if (entries) {
+                       for (i = 0; i < n; ++i) {
+                               free(entries[i]);
+                       }
+                       free(entries);
+               }
+
+               ptr = sep + 1;
+       } while (sep);
+
 
        if (PSI_ContextCompile(C) && SUCCESS != zend_register_functions(NULL, C->closures, NULL, MODULE_PERSISTENT)) {
                C->error(PSI_WARNING, "Failed to register functions!");
        }
 
-       if (entries) {
-               for (i = 0; i < n; ++i) {
-                       free(entries[i]);
-               }
-               free(entries);
-       }
+       free(cpy);
 
 }
 
@@ -689,24 +1161,281 @@ zend_function_entry *PSI_ContextCompile(PSI_Context *C)
                }
        }
 
-
        return C->closures = C->ops->compile(C);
 }
 
+
+void PSI_ContextCall(PSI_Context *C, impl_val *ret_val, decl *decl)
+{
+       C->ops->call(C, ret_val, decl);
+}
+
+static inline void dump_decl_type(int fd, decl_type *t) {
+       const char *pre;
+
+       switch (t->type) {
+       case PSI_T_STRUCT:
+               pre = "struct ";
+               break;
+       default:
+               pre = "";
+       }
+       dprintf(fd, "%s%s", pre, t->name);
+}
+static inline void dump_decl_var(int fd, decl_var *v) {
+       dprintf(fd, "%.*s%s", v->pointer_level-!!v->array_size, "**********", v->name);
+       if (v->array_size) {
+               dprintf(fd, "[%u]", v->array_size);
+       }
+}
+static inline void dump_decl_arg(int fd, decl_arg *a) {
+       dump_decl_type(fd, a->type);
+       dprintf(fd, " ");
+       dump_decl_var(fd, a->var);
+}
+static inline void dump_level(int fd, unsigned level) {
+       dprintf(fd, "%.*s", level, "\t\t\t\t\t\t\t\t\t");
+}
+static inline void dump_num_exp(int fd, num_exp *exp) {
+       while (exp) {
+               switch (exp->t) {
+               case PSI_T_NUMBER:
+                       dprintf(fd, "%s", exp->u.numb);
+                       break;
+               case PSI_T_NSNAME:
+                       dprintf(fd, "%s", exp->u.cnst->name);
+                       break;
+               case PSI_T_NAME:
+                       dump_decl_var(fd, exp->u.dvar);
+                       break;
+               EMPTY_SWITCH_DEFAULT_CASE();
+               }
+               if (exp->operand) {
+                       char op;
+
+                       switch (exp->operator) {
+                       case PSI_T_PLUS:        op = '+'; break;
+                       case PSI_T_MINUS:       op = '-'; break;
+                       case PSI_T_ASTERISK:op = '*'; break;
+                       case PSI_T_SLASH:       op = '/'; break;
+                       EMPTY_SWITCH_DEFAULT_CASE();
+                       }
+                       dprintf(fd, " %c ", op);
+               }
+               exp = exp->operand;
+       }
+}
+static inline void dump_impl_set_value(int fd, set_value *set, unsigned level) {
+       size_t i;
+
+       if (level > 1) {
+               /* only if not directly after `set ...` */
+               dump_level(fd, level);
+       }
+       dprintf(fd, "%s(", set->func->name);
+
+       for (i = 0; i < set->vars->count; ++i) {
+               decl_var *svar = set->vars->vars[i];
+               if (i) {
+                       dprintf(fd, ", ");
+               }
+               dump_decl_var(fd, svar);
+       }
+       if (set->num) {
+               dprintf(fd, ", ");
+               dump_num_exp(fd, set->num);
+       }
+       if (set->inner) {
+               dprintf(fd, ",\n");
+               for (i = 0; i < set->count; ++i) {
+                       dump_impl_set_value(fd, set->inner[i], level+1);
+               }
+               /* only if inner stmts, i.e. with new lines, were dumped */
+               dump_level(fd, level);
+       }
+       if (level > 1) {
+               dprintf(fd, "),\n");
+       } else {
+               dprintf(fd, ");\n");
+       }
+}
+void PSI_ContextDump(PSI_Context *C, int fd)
+{
+       size_t i, j, k, l;
+
+#ifdef HAVE_LIBJIT
+       if (C->ops == PSI_Libjit()) {
+               dprintf(fd, "// psi.engine=jit\n");
+       }
+#endif
+#ifdef HAVE_LIBFFI
+       if (C->ops == PSI_Libffi()) {
+               dprintf(fd, "// psi.engine=ffi\n");
+       }
+#endif
+       dprintf(fd, "\n");
+
+       if (C->defs) {
+               for (i = 0; i < C->defs->count; ++i) {
+                       decl_typedef *tdef = C->defs->list[i];
+
+                       dprintf(fd, "typedef ");
+                       dump_decl_type(fd, tdef->type);
+                       dprintf(fd, " %s;\n", tdef->alias);
+               }
+               dprintf(fd, "\n");
+       }
+
+       if (C->structs) {
+               for (i = 0; i < C->structs->count; ++i) {
+                       decl_struct *strct = C->structs->list[i];
+
+                       dprintf(fd, "struct %s::(%zu) {\n", strct->name, strct->size);
+                       if (strct->args) for (j = 0; j < strct->args->count; ++j) {
+                               decl_arg *sarg = strct->args->args[j];
+
+                               dprintf(fd, "\t");
+                               dump_decl_arg(fd, sarg);
+                               dprintf(fd, "::(%zu, %zu);\n", sarg->layout->pos, sarg->layout->len);
+                       }
+                       dprintf(fd, "}\n");
+               }
+               dprintf(fd, "\n");
+       }
+       if (C->consts) {
+               for (i = 0; i < C->consts->count; ++i) {
+                       constant *cnst = C->consts->list[i];
+
+                       dprintf(fd, "const %s %s = ", cnst->type->name, cnst->name);
+                       if (cnst->val->type == PSI_T_QUOTED_STRING) {
+                               dprintf(fd, "\"%s\";\n", cnst->val->text);
+                       } else {
+                               dprintf(fd, "%s;\n", cnst->val->text);
+                       }
+               }
+               dprintf(fd, "\n");
+       }
+       if (C->decls) {
+               for (i = 0; i < C->decls->count; ++i) {
+                       decl *decl = C->decls->list[i];
+
+                       dprintf(fd, "%s ", decl->abi->convention);
+                       dump_decl_arg(fd, decl->func);
+                       dprintf(fd, "(");
+                       if (decl->args) for (j = 0; j < decl->args->count; ++j) {
+                               if (j) {
+                                       dprintf(fd, ", ");
+                               }
+                               dump_decl_arg(fd, decl->args->args[j]);
+                       }
+                       dprintf(fd, ");\n");
+               }
+               dprintf(fd, "\n");
+       }
+       if (C->impls) {
+               for (i = 0; i < C->impls->count; ++i) {
+                       impl *impl = C->impls->list[i];
+
+                       dprintf(fd, "function %s(", impl->func->name);
+                       if (impl->func->args) for (j = 0; j < impl->func->args->count; ++j) {
+                               impl_arg *iarg = impl->func->args->args[j];
+
+                               dprintf(fd, "%s%s %s$%s",
+                                               j ? ", " : "",
+                                               iarg->type->name,
+                                               iarg->var->reference ? "&" : "",
+                                               iarg->var->name);
+                               if (iarg->def) {
+                                       dprintf(fd, " = %s", iarg->def->text);
+                               }
+                       }
+                       dprintf(fd, ") : %s%s {\n",
+                                       impl->func->return_reference ? "&":"",
+                                       impl->func->return_type->name);
+                       if (impl->stmts) {
+                               for (j = 0; j < impl->stmts->let.count; ++j) {
+                                       let_stmt *let = impl->stmts->let.list[j];
+
+                                       dprintf(fd, "\tlet %s", let->var->name);
+                                       if (let->val) {
+                                               dprintf(fd, " = %s", let->val->is_reference ? "&" : "");
+                                               if (let->val->func) {
+                                                       dprintf(fd, "%s(", let->val->func->name);
+                                                       if (let->val->func->alloc) {
+                                                               dump_num_exp(fd, let->val->func->alloc->nmemb);
+                                                               dprintf(fd, ", ");
+                                                               dump_num_exp(fd, let->val->func->alloc->size);
+                                                       } else {
+                                                               dprintf(fd, "$%s", let->val->var->name);
+                                                       }
+                                                       dprintf(fd, ");\n");
+                                               } else {
+                                                       dprintf(fd, "NULL;\n");
+                                               }
+                                       }
+                               }
+                               for (j = 0; j < impl->stmts->ret.count; ++j) {
+                                       return_stmt *ret = impl->stmts->ret.list[j];
+
+                                       dprintf(fd, "\treturn ");
+                                       dump_impl_set_value(fd, ret->set, 1);
+                               }
+                               for (j = 0; j < impl->stmts->set.count; ++j) {
+                                       set_stmt *set = impl->stmts->set.list[j];
+
+                                       dprintf(fd, "\tset $%s = ", set->var->name);
+                                       dump_impl_set_value(fd, set->val, 1);
+                               }
+                               for (j = 0; j < impl->stmts->fre.count; ++j) {
+                                       free_stmt *fre = impl->stmts->fre.list[j];
+
+                                       dprintf(fd, "\tfree ");
+                                       for (k = 0; k < fre->calls->count; ++k) {
+                                               free_call *call = fre->calls->list[k];
+
+                                               if (k) {
+                                                       dprintf(fd, ", ");
+                                               }
+                                               dprintf(fd, "%s(", call->func);
+                                               for (l = 0; l < call->vars->count; ++l) {
+                                                       decl_var *fvar = call->vars->vars[l];
+
+                                                       dump_decl_var(fd, fvar);
+                                               }
+                                               dprintf(fd, ");\n");
+                                       }
+                               }
+                       }
+                       dprintf(fd, "}\n");
+               }
+               dprintf(fd, "\n");
+       }
+}
+
 void PSI_ContextDtor(PSI_Context *C)
 {
        size_t i;
+       zend_function_entry *zfe;
 
-       C->ops->dtor(C);
+       if (C->ops->dtor) {
+               C->ops->dtor(C);
+       }
 
        free_decl_libs(&C->psi.libs);
 
-       for (i = 0; i < C->count; ++i) {
-               PSI_DataDtor(&C->data[i]);
+       if (C->data) {
+               for (i = 0; i < C->count; ++i) {
+                       PSI_DataDtor(&C->data[i]);
+               }
+               free(C->data);
        }
 
-       free(C->data);
-       free(C->closures);
+       if (C->closures) {
+               for (zfe = C->closures; zfe->fname; ++zfe) {
+                       free((void *) zfe->arg_info);
+               }
+               free(C->closures);
+       }
 
        if (C->consts) {
                if (C->consts->list) {