X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fcontext.c;h=d1f808cb19512d076f90b4b024325d64ca25a9a8;hp=00126c756704b2e434b6afdcacf3f5f4b6e06b48;hb=c9384515a81cb64d345b299908b2852f51bb8e6e;hpb=3c53642a0adccd4b602d147833da24eb4b73bccc

diff --git a/src/context.c b/src/context.c
index 00126c7..d1f808c 100644
--- a/src/context.c
+++ b/src/context.c
@@ -1,820 +1,331 @@
-#include <sys/param.h>
-#include <dlfcn.h>
-#include <dirent.h>
-#include <fnmatch.h>
-#include <errno.h>
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+/*******************************************************************************
+ Copyright (c) 2016, Michael Wallner <mike@php.net>.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+     * Redistributions of source code must retain the above copyright notice,
+       this list of conditions and the following disclaimer.
+     * Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*******************************************************************************/
+
+#include "php_psi_stdinc.h"
 
 #include "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 {
-	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)
-
-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, '/')) {
-#ifdef DARWIN
-		len = snprintf(lib, MAXPATHLEN, "lib%s.dylib", ptr);
+#ifdef HAVE_DIRENT_H
+# include <dirent.h>
+# define NAMLEN(dirent) strlen ((dirent)->d_name)
 #else
-		len = snprintf(lib, MAXPATHLEN, "lib%s.so", ptr);
+# 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
-		if (MAXPATHLEN == len) {
-			data->error(PSI_WARNING, "Library name too long: '%s'", ptr);
-		}
-		lib[len] = 0;
-		ptr = lib;
-	}
-	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;
-	}
-	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;
+#include <fnmatch.h>
 
-	if (type->strct) {
-		return 1;
-	}
-	for (i = 0; i < structs->count; ++i) {
-		if (!strcmp(structs->list[i]->name, type->name)) {
-			type->strct = structs->list[i];
-			return 1;
-		}
-	}
-	return 0;
-}
+#include "php_scandir.h"
+#include "php_psi.h"
+#include "calc.h"
+#include "call.h"
+#include "libjit.h"
+#include "libffi.h"
 
-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;
-	}
-	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;
-	}
-	/* FIXME: check def->alias */
-	return 1;
-}
+#include "token.h"
+#include "parser.h"
 
-static inline int validate_constant(PSI_Data *data, constant *c) {
-	/* FIXME */
-	return 1;
-}
+#include "php_psi_posix.h"
 
-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 = malloc(sizeof(*C));
 	}
-	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);
 	}
 
-	for (i = 0; i < s->args->count; ++i) {
-		decl_arg *darg = s->args->args[i];
-
-		if (!validate_decl_arg(data, darg)) {
-			return 0;
-		}
+	assert(ops->call != NULL);
+	assert(ops->compile != NULL);
 
-		ZEND_ASSERT(!darg->var->arg || darg->var->arg == darg);
-		darg->var->arg = darg;
-
-		if (!darg->layout) {
-			token_t t;
-
-			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;
-			}
-
-			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;
-		}
-	}
-	return 1;
+	return C;
 }
 
-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;
-
-	for (i = 0; i < sizeof(abi_ccs)/sizeof(char*); ++i) {
-		if (strcasecmp(abi->convention, abi_ccs[i])) {
-			return 1;
-		}
-	}
-	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)
+static int psi_select_dirent(const struct dirent *entry)
 {
-	if (!strcmp(func->var->name, "dlsym")) {
-		data->error(PSI_WARNING, "Cannot dlsym dlsym (sic!)");
-		return 0;
-	}
-
-	if (!validate_decl_arg(data, func)) {
-		return 0;
-	}
-#ifndef RTLD_NEXT
-# define RTLD_NEXT ((void *) -1l)
+#ifndef FNM_CASEFOLD
+# define FNM_CASEFOLD 0
 #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());
-	}
-	return 1;
-}
-
-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;
-	}
-	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;
+	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;
+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(s);
-	for (i = 0; i < s->args->count; ++i) {
-		decl_arg *darg = s->args->args[i];
+	C->data = realloc(C->data, (C->count + 1) * sizeof(*C->data));
+	D = psi_data_exchange(&C->data[C->count++], PSI_DATA(P));
 
-		if (!strcmp(var->name, darg->var->name)) {
-			return var->arg = darg;
-		}
-	}
+	psi_validate_scope_ctor(&scope);
+	scope.defs = &P->preproc->defs;
+	valid = psi_validate(&scope, PSI_DATA(C), D);
+	psi_validate_scope_dtor(&scope);
 
-	return NULL;
+	return valid;
 }
-static inline int validate_set_value(PSI_Data *data, set_value *set, decl_arg *ref) {
-	size_t i;
-
-	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 (strcmp(set->vars->vars[0]->name, ref->var->name)) {
-		return 0;
-	}
+void psi_context_build(struct psi_context *C, const char *paths)
+{
+	int i, n;
+	char *sep = NULL, *cpy = strdup(paths), *ptr = cpy;
+	struct dirent **entries;
 
-	if (set->count && (set->func->type != PSI_T_TO_ARRAY || real_decl_type(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_arg *sub_ref = locate_struct_member(real_decl_type(ref->type)->strct, set->inner[i]->vars->vars[0]);
+	do {
+		sep = strchr(ptr, ':');
 
-		if (!sub_ref) {
-			return 0;
+		if (sep) {
+			*sep = 0;
 		}
-		if (!validate_set_value(data, set->inner[i], sub_ref)) {
-			return 0;
-		}
-	}
 
-	return 1;
-}
-static inline decl *locate_impl_decl(decls *decls, return_stmt *ret) {
-	size_t i;
+		entries = NULL;
+		n = php_scandir(ptr, &entries, psi_select_dirent, alphasort);
 
-	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) {
-		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);
-		}
-		return 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, ret->decl)) {
-		return 0;
-	}
+		if (n > 0) {
+			for (i = 0; i < n; ++i) {
+				char psi[MAXPATHLEN];
+				struct psi_parser P;
+				struct psi_parser_input *I;
 
-	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;
-
-		for (j = 0; j < impl->stmts->let.count; ++j) {
-			let_stmt *let = impl->stmts->let.list[j];
-
-			if (!strcmp(let->var->name, darg->var->name)) {
-				darg->let = let;
-				check = 1;
-				break;
-			}
-		}
-		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;
-		}
-	}
-	/* 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 (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;
+				if (MAXPATHLEN <= slprintf(psi, MAXPATHLEN, "%s/%s", ptr, entries[i]->d_name)) {
+					C->error(PSI_DATA(C), NULL, PSI_WARNING, "Path to PSI file too long: %s/%s",
+						ptr, entries[i]->d_name);
 				}
-			}
-			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;
-			}
-		}
-	}
-	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];
-
-			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;
-		}
-
-		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 (!psi_parser_init(&P, C->error, C->flags)) {
+					C->error(PSI_DATA(C), NULL, PSI_WARNING, "Failed to init PSI parser (%s): %s",
+						psi, strerror(errno));
+					continue;
 				}
-			}
-
-			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;
+				if (!(I = psi_parser_open_file(&P, psi, true))) {
+					C->error(PSI_DATA(C), NULL, PSI_WARNING, "Failed to open PSI file (%s): %s",
+						psi, strerror(errno));
+					continue;
+				}
+				psi_parser_parse(&P, I);
+				psi_context_add(C, &P);
+				psi_parser_dtor(&P);
+				free(I);
 			}
 		}
-	}
-	return 1;
-}
-static inline int validate_impl_free_stmts(PSI_Data *data, impl *impl) {
-	size_t i, j, k;
-	/* 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;
-
-			if (!strcmp(free_var->name, impl->decl->func->var->name)) {
-				continue;
+		if (entries) {
+			for (i = 0; i < n; ++i) {
+				free(entries[i]);
 			}
-			if (impl->decl->args) for (k = 0; k < impl->decl->args->count; ++k) {
-				decl_arg *free_arg = impl->decl->args->args[k];
+			free(entries);
+		}
 
-				if (!strcmp(free_var->name, free_arg->var->name)) {
-					check = 1;
-					free_var->arg = free_arg;
-					break;
-				}
-			}
+		ptr = sep + 1;
+	} while (sep);
 
-			if (!check) {
-				data->error(PSI_WARNING, "Unknown variable '%s' of `free` statement"
-						" of implementation '%s'",
-						free_var->name, impl->func->name);
-				return 0;
-			}
-		}
-	}
-	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;
-	}
 
-	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;
+	if (psi_context_compile(C) && SUCCESS != zend_register_functions(NULL, C->closures, NULL, MODULE_PERSISTENT)) {
+		C->error(PSI_DATA(C), NULL, PSI_WARNING, "Failed to register functions!");
 	}
 
-	return 1;
+	free(cpy);
 }
 
-PSI_Context *PSI_ContextInit(PSI_Context *C, PSI_ContextOps *ops, PSI_ContextErrorFunc error)
+zend_function_entry *psi_context_compile(struct psi_context *C)
 {
-	size_t i, j;
-	PSI_Data T;
+	zend_constant zc;
 
-	if (!C) {
-		C = malloc(sizeof(*C));
-	}
-	memset(C, 0, sizeof(*C));
+	zc.flags = CONST_PERSISTENT|CONST_CS;
+	zc.module_number = EG(current_module)->module_number;
 
-	C->error = error;
-	C->ops = ops;
-	ops->init(C);
+	if (C->consts) {
+		size_t i = 0;
+		struct psi_const *c;
 
-	/* build up predefs in a temporary PSI_Data for validation */
-	memset(&T, 0, sizeof(T));
-	T.error = error;
+		while (psi_plist_get(C->consts, i++, &c)) {
 
-	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);
+			if (zend_get_constant_str(c->name, strlen(c->name))) {
+				continue;
+			}
 
-		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);
+			zc.name = zend_string_init(c->name, strlen(c->name), 1);
 
-		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];
-		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;
-
-			if (!member->name) {
+			switch (c->type->type) {
+			case PSI_T_BOOL:
+				ZVAL_BOOL(&zc.value, c->val->ival.zend.bval);
+				break;
+			case PSI_T_INT:
+				ZVAL_LONG(&zc.value, c->val->ival.zend.lval);
+				break;
+			case PSI_T_FLOAT:
+			case PSI_T_DOUBLE:
+				ZVAL_DOUBLE(&zc.value, c->val->ival.dval);
+				break;
+			case PSI_T_STRING:
+			case PSI_T_QUOTED_STRING:
+				ZVAL_NEW_STR(&zc.value, zend_string_copy(c->val->ival.zend.str));
+				break;
+			default:
+				assert(0);
 				break;
 			}
 
-			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);
+			zend_register_constant(&zc);
 		}
-
-		dstruct = init_decl_struct(pre->name, dargs);
-		dstruct->size = pre->size;
-		T.structs = add_decl_struct(T.structs, dstruct);
 	}
 
-	for (i = 0; i < psi_predef_type_count(); ++i) {
-		decl_typedef *def = T.defs->list[i];
+	if (C->enums) {
+		size_t i = 0;
+		struct psi_decl_enum *e;
 
-		if (validate_decl_typedef(&T, def)) {
-			C->defs = add_decl_typedef(C->defs, def);
-		}
-	}
+		while (psi_plist_get(C->enums, i++, &e)) {
+			size_t j = 0;
+			struct psi_decl_enum_item *item;
 
-	for (i = 0; i < psi_predef_const_count(); ++i) {
-		constant *constant = T.consts->list[i];
+			while (psi_plist_get(e->items, j++, &item)) {
+				zend_string *name;
 
-		if (validate_constant(&T, constant)) {
-			C->consts = add_constant(C->consts, constant);
-		}
-	}
+				if (psi_decl_type_is_anon(e->name, "enum")) {
+					name = strpprintf(0, "psi\\%s", item->name);
+				} else {
+					name = strpprintf(0, "psi\\%s\\%s", e->name, item->name);
+				}
 
-	for (i = 0; i < psi_predef_struct_count(); ++i) {
-		decl_struct *dstruct = T.structs->list[i];
+				if (zend_get_constant(name)) {
+					zend_string_release(name);
+					continue;
+				}
 
-		if (validate_decl_struct(&T, dstruct)) {
-			C->structs = add_decl_struct(C->structs, dstruct);
+				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);
+			}
 		}
 	}
 
-	C->count = 1;
-	C->data = malloc(sizeof(*C->data));
-	PSI_DataExchange(C->data, &T);
-
-	return C;
+	return C->closures = C->ops->compile(C);
 }
 
-int PSI_ContextValidate(PSI_Context *C, PSI_Parser *P)
+
+ZEND_RESULT_CODE psi_context_call(struct psi_context *C, zend_execute_data *execute_data, zval *return_value, struct psi_impl *impl)
 {
-	PSI_Data *D;
-	void *dlopened = NULL;
-	size_t count = C->count++;
+	struct psi_call_frame *frame;
 
-	C->data = realloc(C->data, C->count * sizeof(*C->data));
-	D = PSI_DataExchange(&C->data[count], PSI_DATA(P));
+	frame = psi_call_frame_init(C, impl->decl, impl);
 
-	if (D->defs) {
-		size_t i;
+	if (SUCCESS != psi_call_frame_parse_args(frame, execute_data)) {
+		psi_call_frame_free(frame);
 
-		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]);
-			}
-		}
+		return FAILURE;
 	}
-	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]);
-			}
-		}
-	}
-	if (D->consts) {
-		size_t i;
+	psi_call_frame_enter(frame);
 
-		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]);
-			}
-		}
-	}
+	if (SUCCESS != psi_call_frame_do_let(frame)) {
+		psi_call_frame_do_return(frame, return_value);
+		psi_call_frame_free(frame);
 
-	if (!validate_lib(D, &dlopened)) {
-		return 0;
+		return FAILURE;
 	}
 
-	add_decl_lib(&C->psi.libs, dlopened);
-
-	if (D->decls) {
-		size_t i;
+	if (SUCCESS != psi_call_frame_do_assert(frame, PSI_ASSERT_PRE)) {
+		psi_call_frame_do_return(frame, return_value);
+		psi_call_frame_free(frame);
 
-		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 (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]);
-			}
-		}
+		return FAILURE;
 	}
 
-	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);
-}
-
-void PSI_ContextBuild(PSI_Context *C, const char *path)
-{
-	int i, n;
-	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;
-
-		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;
-		}
+	C->ops->call(frame);
 
-		while (-1 != PSI_ParserScan(&P)) {
-			PSI_ParserParse(&P, PSI_TokenAlloc(&P));
-		};
-		PSI_ParserParse(&P, NULL);
-		PSI_ContextValidate(C, &P);
-		PSI_ParserDtor(&P);
-	}
+	if (SUCCESS != psi_call_frame_do_assert(frame, PSI_ASSERT_POST)) {
+		psi_call_frame_do_return(frame, return_value);
+		psi_call_frame_free(frame);
 
-	if (PSI_ContextCompile(C) && SUCCESS != zend_register_functions(NULL, C->closures, NULL, MODULE_PERSISTENT)) {
-		C->error(PSI_WARNING, "Failed to register functions!");
+		return FAILURE;
 	}
 
-	if (entries) {
-		for (i = 0; i < n; ++i) {
-			free(entries[i]);
-		}
-		free(entries);
-	}
+	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);
 
+	return SUCCESS;
 }
 
-zend_function_entry *PSI_ContextCompile(PSI_Context *C)
-{
-	size_t i;
 
-	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);
-		}
-	}
-
-
-	return C->closures = C->ops->compile(C);
-}
-
-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);
-
-	free_decl_libs(&C->psi.libs);
-
-	for (i = 0; i < C->count; ++i) {
-		PSI_DataDtor(&C->data[i]);
+	if (C->ops->dtor) {
+		C->ops->dtor(C);
 	}
 
-	free(C->data);
-	free(C->closures);
+	psi_data_dtor(PSI_DATA(C));
 
-	if (C->consts) {
-		if (C->consts->list) {
-			free(C->consts->list);
-		}
-		free(C->consts);
-	}
-	if (C->defs) {
-		if (C->defs->list) {
-			free(C->defs->list);
-		}
-		free(C->defs);
-	}
-	if (C->structs) {
-		if (C->structs->list) {
-			free(C->structs->list);
-		}
-		free(C->structs);
-	}
-	if (C->decls) {
-		if (C->decls->list) {
-			free(C->decls->list);
+	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) {
+			free((void *) zfe->arg_info);
 		}
-		free(C->impls);
+		free(C->closures);
 	}
-
-	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_context *C, int fd)
+{
+	dprintf(fd, "// psi.engine=%s\n",
+			(char *) C->ops->query(C, PSI_CONTEXT_QUERY_SELF, NULL));
+
+	psi_data_dump(fd, PSI_DATA(C));
+}