X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fcontext.c;h=5776e9fbd997c09eb1aec6b92718f1ddd4b74f2e;hp=b7ae46f3ae68deffce6465b94069416a3949549f;hb=refs%2Fheads%2Fmaster;hpb=2f5af21b263403997e154658635d6b6e6eaab453

diff --git a/src/context.c b/src/context.c
index b7ae46f..5776e9f 100644
--- a/src/context.c
+++ b/src/context.c
@@ -1,11 +1,32 @@
+/*******************************************************************************
+ 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"
-#else
-# include "php_config.h"
 #endif
 
-#include "php_psi_stdinc.h"
-
 #include "php.h"
 
 #ifdef HAVE_DIRENT_H
@@ -25,653 +46,833 @@
 # 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 "calc.h"
+#include "call.h"
 #include "libjit.h"
 #include "libffi.h"
 
 #include "token.h"
 #include "parser.h"
 
-#include "php_psi_types.h"
-#include "php_psi_consts.h"
-#include "php_psi_decls.h"
-#include "php_psi_va_decls.h"
-#include "php_psi_fn_decls.h"
-#include "php_psi_structs.h"
-#include "php_psi_unions.h"
-
-struct psi_context *psi_context_init(struct psi_context *C, struct psi_context_ops *ops, psi_error_cb error, unsigned flags)
+PHP_MINIT_FUNCTION(psi_context);
+PHP_MINIT_FUNCTION(psi_context)
 {
-	struct psi_data T;
-	struct psi_predef_type *predef_type;
-	struct psi_predef_const *predef_const;
-	struct psi_predef_struct *predef_struct;
-	struct psi_predef_union *predef_union;
-	struct psi_predef_decl *predef_decl;
+	unsigned flags = 0;
+	struct psi_context_ops *ops = NULL;
 
-	if (!C) {
-		C = malloc(sizeof(*C));
+#ifdef HAVE_LIBJIT
+	if (!strcasecmp(PSI_G(engine), "jit")) {
+		ops = psi_libjit_ops();
+	} else
+#endif
+#ifdef HAVE_LIBFFI
+		ops = psi_libffi_ops();
+#endif
+
+	if (!ops) {
+		php_error(E_WARNING, "No PSI engine found");
+		return FAILURE;
 	}
-	memset(C, 0, sizeof(*C));
 
-	C->error = error;
-	C->flags = flags;
-	C->ops = ops;
+	PSI_G(ops) = ops;
+	if (ops->load && !ops->load()) {
+		return FAILURE;
+	}
 
-	if (ops->init) {
-		ops->init(C);
+	if (psi_check_env("PSI_DEBUG")) {
+		flags |= PSI_DEBUG;
+	}
+	if (psi_check_env("PSI_SILENT")) {
+		flags |= PSI_SILENT;
 	}
 
-	ZEND_ASSERT(ops->call != NULL);
-	ZEND_ASSERT(ops->compile != NULL);
+	PSI_G(context) = psi_context_init(NULL, PSI_G(ops), psi_error_wrapper, flags);
+	psi_context_build(PSI_G(context), PSI_G(directory));
 
-	/* build up predefs in a temporary PSI_Data for validation */
-	memset(&T, 0, sizeof(T));
-	T.error = error;
+	return SUCCESS;
+}
 
-	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_var *var = init_decl_var(predef_type->alias, 0, 0); /* FIXME: indirection */
-		decl_arg *def = init_decl_arg(type, var);
+PHP_MSHUTDOWN_FUNCTION(psi_context);
+PHP_MSHUTDOWN_FUNCTION(psi_context)
+{
+	if (psi_check_env("PSI_DUMP")) {
+		struct psi_dump dump = {{.hn = stdout}, (psi_dump_cb) fprintf};
 
-		T.defs = add_decl_typedef(T.defs, def);
+		psi_context_dump(&dump, PSI_G(context));
 	}
-	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 (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 = init_decl_struct(predef_struct->var_name, dargs);
+	psi_context_free(&PSI_G(context));
 
-		dstruct->size = predef_struct->size;
-		dstruct->align = predef_struct->offset;
-		for (member = &predef_struct[1]; member->type_tag; ++member) {
-			decl_type *type;
-			decl_var *dvar;
-			decl_arg *darg;
+	if (PSI_G(ops)->free) {
+		PSI_G(ops)->free();
+	}
 
-			type = init_decl_type(member->type_tag, member->type_name);
-			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->offset, member->size);
-			dargs = add_decl_arg(dargs, darg);
-		}
+	return SUCCESS;
+}
 
-		T.structs = add_decl_struct(T.structs, dstruct);
-		predef_struct = member;
-	}
-	for (predef_union = &psi_predef_unions[0]; predef_union->type_tag; ++predef_union) {
-		struct psi_predef_union *member;
-		decl_args *dargs = init_decl_args(NULL);
-		decl_union *dunion = init_decl_union(predef_union->var_name, dargs);
-
-		dunion->size = predef_union->size;
-		dunion->align = predef_union->offset;
-		for (member = &predef_union[1]; member->type_tag; ++member) {
-			decl_type *type;
-			decl_var *dvar;
-			decl_arg *darg;
-
-			type = init_decl_type(member->type_tag, member->type_name);
-			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->offset, member->size);
-			dargs = add_decl_arg(dargs, darg);
-		}
+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);
+	}
+	memset(C, 0, sizeof(*C));
 
-		T.unions = add_decl_union(T.unions, dunion);
-		predef_union = 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);
-		}
+	psi_data_ctor(PSI_DATA(C), error, flags);
+	C->ops = ops;
 
-		T.decls = add_decl(T.decls, decl);
-		predef_decl = farg;
+	if (ops->init && !ops->init(C)) {
+		return NULL;
 	}
 
-	for (predef_decl = &psi_predef_vararg_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);
+	return C;
+}
 
-		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);
-		}
-		args->varargs = 1;
+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};
+
+	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));
+
+	psi_validate_scope_ctor(&scope);
+	scope.cpp = P->preproc;
+	valid = psi_validate(&scope, PSI_DATA(C), D);
+	psi_validate_scope_dtor(&scope);
 
-		T.decls = add_decl(T.decls, decl);
-		predef_decl = farg;
+	return valid;
+}
+
+struct psi_context_build_worker {
+#if PSI_THREADED_PARSER
+	pthread_t tid;
+#endif
+	struct psi_parser parser;
+	struct psi_parser_input *input;
+	char psi_file[PATH_MAX];
+};
+
+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 (PATH_MAX <= slprintf(w->psi_file, PATH_MAX, "%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 w;
+}
 
-	for (predef_decl = &psi_predef_functor_decls[0]; predef_decl->type_tag; ++predef_decl) {
-		struct psi_predef_decl *farg;
-		decl_type *dtype, *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 *tdef, *func = init_decl_arg(ftype, fname);
-		decl_args *args = init_decl_args(NULL);
-		decl *decl = init_decl(init_decl_abi("default"), func, args);
+#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 (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);
-		}
+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;
+	}
+}
+#endif
+
+static bool psi_context_build_worker_exec(struct psi_context_build_worker *w)
+{
+	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
+}
 
-		dtype = init_decl_type(PSI_T_FUNCTION, fname->name);
-		dtype->real.func = decl;
-		tdef = init_decl_arg(dtype, copy_decl_var(fname));
-		T.defs = add_decl_typedef(T.defs, tdef);
+static bool psi_context_build_worker_done(struct psi_context_build_worker *w)
+{
+#if PSI_THREADED_PARSER
+	void *rval = NULL;
 
-		predef_decl = farg;
+	if (!w->tid) {
+		return true;
 	}
 
-	psi_context_validate_data(PSI_DATA(C), &T);
+# 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;
+	}
+# endif
+	return false;
+#else
+	return true;
+#endif
+}
 
-	C->count = 1;
-	C->data = malloc(sizeof(*C->data));
-	psi_data_exchange(C->data, &T);
+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);
 
-	return C;
+		if (rc) {
+			w->parser.error(PSI_DATA(&w->parser), NULL, PSI_WARNING,
+					"Failed to finish parser thread: %s", strerror(errno));
+		}
+	}
+#endif
+	psi_parser_input_free(&w->input);
+	psi_parser_dtor(&w->parser);
+}
+
+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;
+	}
 }
 
 static int psi_select_dirent(const struct dirent *entry)
 {
 #ifndef FNM_CASEFOLD
-#define FNM_CASEFOLD 0
+# define FNM_CASEFOLD 0
 #endif
 	return 0 == fnmatch("*.psi", entry->d_name, FNM_CASEFOLD);
 }
 
 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;
+	struct psi_context_build_worker *worker;
+	struct psi_plist *workers = psi_plist_init(
+			(psi_plist_dtor) psi_context_build_worker_free);
 
 	do {
-		sep = strchr(ptr, ':');
+		struct dirent **entries = NULL;
+		int i, n;
 
-		if (sep) {
+		if ((sep = strchr(ptr, ':'))) {
 			*sep = 0;
 		}
 
-		entries = NULL;
 		n = php_scandir(ptr, &entries, psi_select_dirent, alphasort);
 
-		if (n > 0) {
+		if (n < 0) {
+			char cwd[PATH_MAX];
+			C->error(PSI_DATA(C), NULL, PSI_WARNING,
+					"Failed to scan PSI directory '%s%s%s': %s",
+					*ptr == '/' ? "" : getcwd(cwd, PATH_MAX),
+					*ptr != '/' && *ptr != '.' ? "/" : "",
+					ptr, strerror(errno));
+		} else {
 			for (i = 0; i < n; ++i) {
-				char psi[MAXPATHLEN];
-				struct psi_parser P;
-
-				if (MAXPATHLEN <= slprintf(psi, MAXPATHLEN, "%s/%s", ptr, entries[i]->d_name)) {
-					C->error(C, NULL, PSI_WARNING, "Path to PSI file too long: %s/%s",
-						ptr, entries[i]->d_name);
-				}
-				if (!psi_parser_init(&P, psi, C->error, C->flags)) {
-					C->error(C, NULL, PSI_WARNING, "Failed to init PSI parser (%s): %s",
-						psi, strerror(errno));
-					continue;
+				worker = psi_context_build_worker_init(C, ptr, entries[i]->d_name);
+				PSI_DEBUG_PRINT(C, "PSI: init worker(%p) for %s/%s\n",
+						worker, ptr, entries[i]->d_name);
+				if (worker) {
+					workers = psi_plist_add(workers, &worker);
 				}
+				free(entries[i]);
+			}
+			free(entries);
+		}
+		ptr = sep + 1;
+	} while (sep);
 
-				while (0 < psi_parser_scan(&P)) {
-					psi_parser_parse(&P, psi_token_alloc(&P));
-					if (P.num == PSI_T_EOF) {
-						break;
-					}
-				}
+	free(cpy);
+
+	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
 
-				psi_parser_parse(&P, NULL);
-				psi_context_validate(C, &P);
-				psi_parser_dtor(&P);
+		while (psi_plist_count(workers) && active < pool) {
+			if (psi_plist_pop(workers, &worker)) {
+				PSI_DEBUG_PRINT(C, "PSI: starting worker %p\n", worker);
+				if (psi_context_build_worker_exec(worker)) {
+					running = psi_plist_add(running, &worker);
+					++active;
+				}
 			}
 		}
+		while (active) {
+			size_t i = 0;
 
-		if (entries) {
-			for (i = 0; i < n; ++i) {
-				free(entries[i]);
+			while (psi_plist_get(running, i++, &worker)) {
+				if (psi_context_build_worker_done(worker)) {
+					PSI_DEBUG_PRINT(C, "PSI: collecting worker %p\n", worker);
+					psi_context_add(C, &worker->parser);
+
+					psi_plist_del(running, --i, NULL);
+					psi_context_build_worker_free(&worker);
+
+					if (psi_plist_pop(workers, &worker)) {
+						PSI_DEBUG_PRINT(C, "PSI: starting worker %p\n", worker);
+						if (psi_context_build_worker_exec(worker)) {
+							running = psi_plist_add(running, &worker);
+						}
+					} else {
+						--active;
+					}
+				}
 			}
-			free(entries);
 		}
+		psi_plist_free(running);
+	}
+	psi_plist_free(workers);
 
-		ptr = sep + 1;
-	} while (sep);
+	psi_context_compile(C);
+}
 
+#include <ctype.h>
+static inline bool prefix_match(zend_string *a, zend_string *b)
+{
+	size_t i;
 
-	if (psi_context_compile(C) && SUCCESS != zend_register_functions(NULL, C->closures, NULL, MODULE_PERSISTENT)) {
-		C->error(C, NULL, PSI_WARNING, "Failed to register functions!");
+	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;
+		}
 	}
 
-	free(cpy);
-
+	return true;
 }
 
-zend_function_entry *psi_context_compile(struct psi_context *C)
+static inline void psi_context_consts_init(struct psi_context *C)
 {
-	size_t i;
 	zend_constant zc;
 
-	zc.flags = CONST_PERSISTENT|CONST_CS;
-	zc.module_number = EG(current_module)->module_number;
+	ZEND_CONSTANT_SET_FLAGS(&zc, CONST_CS|CONST_PERSISTENT, EG(current_module)->module_number);
 
 	if (C->consts) {
-		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;
-			case PSI_T_STRING:
-			case PSI_T_QUOTED_STRING:
-				break;
-			default:
-				assert(0);
+		size_t i = 0;
+		struct psi_const *c;
+
+		while (psi_plist_get(C->consts, i++, &c)) {
+
+			if (zend_get_constant(c->name)) {
+				continue;
 			}
+
+			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);
 		}
 	}
 	if (C->enums) {
-		for (i = 0; i < C->enums->count; ++i) {
-			decl_enum *e = C->enums->list[i];
-			size_t j;
+		size_t i = 0;
+		struct psi_decl_enum *e;
 
-			for (j = 0; j < e->items->count; ++j) {
-				decl_enum_item *i = e->items->list[j];
-				zend_string *name = strpprintf(0, "psi\\%s\\%s", e->name, i->name);
+		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 (zend_get_constant(name)) {
+					zend_string_release(name);
+					continue;
+				}
 
 				zc.name = zend_string_dup(name, 1);
-				ZVAL_LONG(&zc.value, psi_long_num_exp(i->num, NULL));
+				ZVAL_LONG(&zc.value, psi_num_exp_get_long(item->num, NULL, NULL));
 				zend_register_constant(&zc);
 				zend_string_release(name);
 			}
 		}
 	}
-
-	return C->closures = C->ops->compile(C);
 }
 
+static inline void psi_context_extvars_init(struct psi_context *C)
+{
+	if (C->vars) {
+		size_t v = 0;
+		struct psi_decl_extvar *evar;
 
-void psi_context_call(struct psi_context *C, struct decl_callinfo *decl_call, struct impl_vararg *va)
+		while (psi_plist_get(C->vars, v++, &evar)) {
+			C->ops->extvar_init(C, evar);
+		}
+	}
+}
+
+static inline void psi_context_callback_init(struct psi_context *C,
+		struct psi_let_exp *let_exp, struct psi_impl *impl)
 {
-	C->ops->call(C, decl_call, va);
+	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;
+	}
 }
 
+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;
+	}
+}
 
-void psi_context_dtor(struct psi_context *C)
+static inline void psi_context_impls_init(struct psi_context *C)
 {
-	size_t i;
-	zend_function_entry *zfe;
+	size_t nf = 0;
+	zend_function_entry *zfe = NULL;
 
-	if (C->ops->dtor) {
-		C->ops->dtor(C);
-	}
+	if (C->impls) {
+		size_t i = 0;
+		struct psi_impl *impl;
 
-	free_decl_libs(&C->psi.libs);
+		zfe = pecalloc(psi_plist_count(C->impls) + 1, sizeof(*zfe), 1);
 
-	if (C->data) {
-		for (i = 0; i < C->count; ++i) {
-			psi_data_dtor(&C->data[i]);
+		while (psi_plist_get(C->impls, i++, &impl)) {
+			zend_function_entry *zf = &zfe[nf];
+			struct psi_let_stmt *let;
+			size_t l = 0;
+
+			if (!impl->decl) {
+				continue;
+			}
+			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);
+			}
+
+			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;
 		}
-		free(C->data);
 	}
 
-	if (C->closures) {
-		for (zfe = C->closures; zfe->fname; ++zfe) {
-			free((void *) zfe->arg_info);
+	C->closures = zfe;
+}
+
+static inline void psi_context_decls_init(struct psi_context *C)
+{
+	if (C->decls) {
+		size_t d = 0;
+		struct psi_decl *decl;
+
+		while (psi_plist_get(C->decls, d++, &decl)) {
+			if (!decl->info) {
+				C->ops->decl_init(C, decl);
+			}
 		}
-		free(C->closures);
 	}
+}
 
-	if (C->consts) {
-		if (C->consts->list) {
-			free(C->consts->list);
-		}
-		free(C->consts);
+struct psi_struct_type_data {
+	struct psi_plist *els;
+	size_t offset;
+	size_t max_align;
+};
+
+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);
+
+	while (padding--) {
+		void *pad = C->ops->copyof_type(C, ele);
+		data->els = psi_plist_add(data->els, &pad);
 	}
-	if (C->defs) {
-		if (C->defs->list) {
-			free(C->defs->list);
-		}
-		free(C->defs);
+}
+
+static inline void psi_struct_type_element(struct psi_context *C,
+		struct psi_struct_type_data *data, struct psi_decl_arg *darg)
+{
+	void *type, *copy;
+	size_t i;
+	struct psi_layout type_layout;
+
+	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;
 	}
-	if (C->structs) {
-		if (C->structs->list) {
-			free(C->structs->list);
-		}
-		free(C->structs);
+
+	type = psi_context_decl_arg_full_type(C, darg);
+	C->ops->layoutof_type(C, type, &type_layout);
+
+	if (type_layout.pos > data->max_align) {
+		data->max_align = type_layout.pos;
 	}
-	if (C->unions) {
-		if (C->unions->list) {
-			free(C->unions->list);
-		}
-		free(C->unions);
+
+	assert(type_layout.len <= darg->layout->len);
+
+	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);
 	}
-	if (C->enums) {
-		if (C->enums->list) {
-			free(C->enums->list);
+	assert(darg->layout->len == type_layout.len * (darg->var->array_size ?: 1));
+	data->offset += darg->layout->len;
+}
+
+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;
 		}
-		free(C->enums);
+		psi_struct_type_element(C, &data, darg);
 	}
-	if (C->decls) {
-		if (C->decls->list) {
-			free(C->decls->list);
-		}
-		free(C->decls);
+
+	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);
+
+	*els = data.els;
+}
+
+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);
+
+	if (real != darg->type && darg->type->real.def->var->pointer_level) {
+		return C->ops->typeof_decl(C, PSI_T_POINTER);
 	}
-	if (C->impls) {
-		if (C->impls->list) {
-			free(C->impls->list);
-		}
-		free(C->impls);
+
+	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);
 	}
 
-	memset(C, 0, sizeof(*C));
+	if (real->type == PSI_T_STRUCT) {
+		C->ops->composite_init(C, darg);
+		return darg->engine.type;
+	}
+
+	return C->ops->typeof_decl(C, real->type);
 }
 
-void psi_context_free(struct psi_context **C)
+void *psi_context_decl_arg_call_type(struct psi_context *C,
+		struct psi_decl_arg *darg)
 {
-	if (*C) {
-		psi_context_dtor(*C);
-		free(*C);
-		*C = NULL;
+	if (darg->var->pointer_level) {
+		return C->ops->typeof_decl(C, PSI_T_POINTER);
 	}
+
+	return psi_context_decl_arg_type(C, darg);
 }
 
-int psi_context_validate(struct psi_context *C, struct psi_parser *P)
+void *psi_context_decl_arg_full_type(struct psi_context *C,
+		struct psi_decl_arg *darg)
 {
-	struct psi_data *D;
-	void *dlopened = NULL;
-	size_t i, count = C->count++, check_round, check_count;
-	decl_typedefs *check_defs = P->defs;
-	decl_structs *check_structs = P->structs;
-	decl_unions *check_unions = P->unions;
-	decl_enums *check_enums = P->enums;
-	unsigned flags = C->flags;
-
-	C->data = realloc(C->data, C->count * sizeof(*C->data));
-	D = psi_data_exchange(&C->data[count], PSI_DATA(P));
-
-#define REVALIDATE(what) do { \
-		if (check_round && check_ ##what) { \
-			free(check_ ##what->list); \
-			free(check_ ##what); \
-		} \
-		check_ ##what = recheck_ ##what; \
-} while (0)
-#define CHECK_TOTAL (CHECK_COUNT(defs) + CHECK_COUNT(structs) + CHECK_COUNT(enums))
-#define CHECK_COUNT(of) (check_ ##of ? check_ ##of->count : 0)
-
-	if (!(flags & PSI_PARSER_SILENT)) {
-		/* no warnings on first round */
-		C->flags |= PSI_PARSER_SILENT;
-	}
-	for (check_round = 0, check_count = 0; CHECK_TOTAL && check_count != CHECK_TOTAL; ++check_round) {
-		decl_typedefs *recheck_defs = NULL;
-		decl_structs *recheck_structs = NULL;
-		decl_unions *recheck_unions = NULL;
-		decl_enums *recheck_enums = NULL;
-
-		check_count = CHECK_TOTAL;
-
-		for (i = 0; i < CHECK_COUNT(defs); ++i) {
-			if (validate_decl_typedef(PSI_DATA(C), check_defs->list[i])) {
-				C->defs = add_decl_typedef(C->defs, check_defs->list[i]);
-			} else {
-				recheck_defs = add_decl_typedef(recheck_defs, check_defs->list[i]);
-			}
-		}
-		for (i = 0; i < CHECK_COUNT(structs); ++i) {
-			if (validate_decl_struct(PSI_DATA(C), check_structs->list[i])) {
-				C->structs = add_decl_struct(C->structs, check_structs->list[i]);
-			} else {
-				recheck_structs = add_decl_struct(recheck_structs, check_structs->list[i]);
-			}
-		}
-		for (i = 0; i < CHECK_COUNT(unions); ++i) {
-			if (validate_decl_union(PSI_DATA(C), check_unions->list[i])) {
-				C->unions = add_decl_union(C->unions, check_unions->list[i]);
-			} else {
-				recheck_unions = add_decl_union(recheck_unions, check_unions->list[i]);
-			}
+	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);
+	}
+
+	return psi_context_decl_arg_type(C, darg);
+}
+
+void **psi_context_composite_type_elements(struct psi_context *C,
+		struct psi_decl_arg *darg, struct psi_plist **eles)
+{
+	struct psi_decl_type *dtype;
+	struct psi_decl_arg *tmp;
+	void *type, *copy;
+	size_t i;
+
+	dtype = psi_decl_type_get_real(darg->type);
+
+	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);
 		}
-		for (i = 0; i < CHECK_COUNT(enums); ++i) {
-			if (validate_decl_enum(PSI_DATA(C), check_enums->list[i])) {
-				C->enums = add_decl_enum(C->enums, check_enums->list[i]);
-			} else {
-				recheck_enums = add_decl_enum(recheck_enums, check_enums->list[i]);
-			}
+		break;
+	default:
+		type = psi_context_decl_arg_type(C, darg);
+		for (i = 0; i < darg->var->array_size; ++i) {
+			copy = C->ops->copyof_type(C, type);
+			*eles = psi_plist_add(*eles, &copy);
 		}
+	}
 
-		REVALIDATE(defs);
-		REVALIDATE(structs);
-		REVALIDATE(unions);
-		REVALIDATE(enums);
+	return psi_plist_eles(*eles);
+}
 
-		if (check_round == 0 && !(flags & PSI_PARSER_SILENT)) {
-			C->flags ^= PSI_PARSER_SILENT;
-		}
+void psi_context_compile(struct psi_context *C)
+{
+	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;
+}
 
-	C->flags = flags;
+bool psi_context_call(struct psi_context *C, zend_execute_data *execute_data, zval *return_value, struct psi_impl *impl)
+{
+	struct psi_call_frame *frame;
 
-	if (D->consts) {
-		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]);
-			}
-		}
+	frame = psi_call_frame_init(C, impl->decl, impl);
+
+	if (!psi_call_frame_parse_args(frame, execute_data)) {
+		psi_call_frame_free(frame);
+
+		return false;
 	}
 
-	if (!validate_file(D, &dlopened)) {
-		return 0;
+	psi_call_frame_enter(frame);
+
+	if (!psi_call_frame_do_let(frame)) {
+		psi_call_frame_do_return(frame, return_value);
+		psi_call_frame_free(frame);
+
+		return false;
 	}
 
-	add_decl_lib(&C->psi.libs, dlopened);
+	if (!psi_call_frame_do_assert(frame, PSI_ASSERT_PRE)) {
+		psi_call_frame_do_return(frame, return_value);
+		psi_call_frame_free(frame);
 
-	if (D->decls) {
-		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]);
-			}
-		}
+		return false;
 	}
-	if (D->impls) {
-		for (i = 0; i < D->impls->count; ++i) {
-			if (validate_impl(PSI_DATA(C), D->impls->list[i])) {
-				C->impls = add_impl(C->impls, D->impls->list[i]);
-			}
-		}
+
+	if (psi_call_frame_num_var_args(frame)) {
+		C->ops->call_va(frame);
+	} else {
+		C->ops->call(frame);
 	}
 
-	return 1;
+	if (!psi_call_frame_do_assert(frame, PSI_ASSERT_POST)) {
+		psi_call_frame_do_return(frame, return_value);
+		psi_call_frame_free(frame);
+
+		return false;
+	}
+
+	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 true;
 }
 
-int psi_context_validate_data(struct psi_data *dest, struct psi_data *source)
+
+void psi_context_dtor(struct psi_context *C)
 {
 	size_t i;
-	int errors = 0;
-
-	if (source->defs) for (i = 0; i < source->defs->count; ++i) {
-		decl_arg *def = source->defs->list[i];
+	zend_function_entry *zfe;
 
-		if (validate_decl_typedef(source, def)) {
-			if (dest) {
-				dest->defs = add_decl_typedef(dest->defs, def);
-			}
-		} else {
-			++errors;
-		}
-	}
+	if (C->decls) {
+		size_t i = 0;
+		struct psi_decl *decl;
 
-	if (source->consts) for (i = 0; i < source->consts->count; ++i) {
-		constant *constant = source->consts->list[i];
+		while (psi_plist_get(C->decls, i++, &decl)) {
+			size_t j = 0;
+			struct psi_decl_arg *darg;
 
-		if (validate_constant(source, constant)) {
-			if (dest) {
-				dest->consts = add_constant(dest->consts, constant);
+			while (psi_plist_get(decl->args, j++, &darg)) {
+				C->ops->composite_dtor(C, darg);
 			}
-		} else {
-			++errors;
+			C->ops->composite_dtor(C, decl->func);
+			C->ops->decl_dtor(C, decl);
 		}
-	}
 
-	if (source->structs) for (i = 0; i < source->structs->count; ++i) {
-		decl_struct *dstruct = source->structs->list[i];
+	}
+	if (C->vars) {
+		size_t i = 0;
+		struct psi_decl_extvar *evar;
 
-		if (validate_decl_struct(source, dstruct)) {
-			if (dest) {
-				dest->structs = add_decl_struct(dest->structs, dstruct);
-			}
-		} else {
-			++errors;
+		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);
 		}
 	}
+	if (C->impls) {
+		size_t i = 0;
+		struct psi_impl *impl;
 
-	if (source->unions) for (i = 0; i < source->unions->count; ++i) {
-		decl_union *dunion = source->unions->list[i];
+		while (psi_plist_get(C->impls, i++, &impl)) {
+			struct psi_let_stmt *let;
+			size_t j = 0;
 
-		if (validate_decl_union(source, dunion)) {
-			if (dest) {
-				dest->unions = add_decl_union(dest->unions, dunion);
+			while (psi_plist_get(impl->stmts.let, j++, &let)) {
+				psi_context_callback_dtor(C, let->exp, impl);
 			}
-		} else {
-			++errors;
+
+			C->ops->impl_dtor(C, impl);
 		}
 	}
 
-	if (source->enums) for (i = 0; i < source->enums->count; ++i) {
-		decl_enum *denum = source->enums->list[i];
-
-		if (validate_decl_enum(source, denum)) {
-			if (dest) {
-				dest->enums = add_decl_enum(dest->enums, denum);
-			}
-		} else {
-			++errors;
-		}
+	if (C->ops->dtor) {
+		C->ops->dtor(C);
 	}
 
-	if (source->decls) for (i = 0; i < source->decls->count; ++i) {
-		decl *decl = source->decls->list[i];
+	psi_data_dtor(PSI_DATA(C));
 
-		if (validate_decl(source, NULL, decl)) {
-			if (dest) {
-				dest->decls = add_decl(dest->decls, decl);
-			}
-		} else {
-			++errors;
+	if (C->data) {
+		for (i = 0; i < C->count; ++i) {
+			psi_data_dtor(&C->data[i]);
 		}
+		free(C->data);
 	}
 
-	if (source->impls) for (i = 0; i < source->impls->count; ++i) {
-		impl *impl = source->impls->list[i];
-
-		if (validate_impl(source, impl)) {
-			if (dest) {
-				dest->impls = add_impl(dest->impls, impl);
-			}
-		} else {
-			++errors;
+	if (C->closures) {
+		for (zfe = C->closures; zfe->fname; ++zfe) {
+			pefree((void *) zfe->arg_info, 1);
 		}
+		pefree(C->closures, 1);
 	}
-
-	return errors;
 }
 
-static inline void dump_data(int fd, struct psi_data *D) {
-	if (D->psi.file.fn) {
-		dprintf(fd, "// psi.filename=%s\n", D->psi.file.fn);
-		if (D->psi.file.ln) {
-			dprintf(fd, "lib \"%s\";\n", D->psi.file.ln);
-		}
-	} else {
-		dprintf(fd, "// builtin predef\n");
-	}
-	if (D->defs) {
-		dump_decl_typedefs(fd, D->defs);
-		dprintf(fd, "\n");
-	}
-	if (D->unions) {
-		dump_decl_unions(fd, D->unions);
-		dprintf(fd, "\n");
-	}
-	if (D->structs) {
-		dump_decl_structs(fd, D->structs);
-		dprintf(fd, "\n");
-	}
-	if (D->enums) {
-		dump_decl_enums(fd, D->enums);
-		dprintf(fd, "\n");
-	}
-	if (D->consts) {
-		dump_constants(fd, D->consts);
-		dprintf(fd, "\n");
-	}
-	if (D->decls) {
-		dump_decls(fd, D->decls);
-		dprintf(fd, "\n");
-	}
-	if (D->impls) {
-		dump_impls(fd, D->impls);
-		dprintf(fd, "\n");
+void psi_context_free(struct psi_context **C)
+{
+	if (*C) {
+		psi_context_dtor(*C);
+		free(*C);
+		*C = NULL;
 	}
 }
 
-void psi_context_dump(struct psi_context *C, int fd)
+void psi_context_dump(struct psi_dump *dump, struct psi_context *C)
 {
-	size_t i;
+	PSI_DUMP(dump, "// psi.engine=%s\n// %lu files\n",
+			C->ops->name, C->count);
 
-#ifdef HAVE_LIBJIT
-	if (C->ops == psi_libjit_ops()) {
-		dprintf(fd, "// psi.engine=jit\n");
-	}
-#endif
-#ifdef HAVE_LIBFFI
-	if (C->ops == psi_libffi_ops()) {
-		dprintf(fd, "// psi.engine=ffi\n");
-	}
-#endif
-	dprintf(fd, "\n");
+	psi_data_dump(dump, PSI_DATA(C));
 
-	for (i = 0; i < C->count; ++i) {
-		dump_data(fd, &C->data[i]);
-	}
+#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
 }