X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fmodule.c;h=5ff4b50e3b4ef5035a468101f00012b892908fb5;hp=39d12917a0c3a183f342eeb3ccbbbb75457b7a18;hb=c0873cbbe9e5a83305adbc2bbd94aede5437f33d;hpb=19f0eb5807fb8d0f3aa305f2476f094e66a02709

diff --git a/src/module.c b/src/module.c
index 39d1291..5ff4b50 100644
--- a/src/module.c
+++ b/src/module.c
@@ -1,16 +1,43 @@
-
-#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_ini.h"
 #include "ext/standard/info.h"
-#include "zend_exceptions.h"
 #include "zend_constants.h"
 #include "zend_operators.h"
 
 #include "php_psi.h"
+#include "token.h"
+#include "parser.h"
+#include "cpp.h"
+
+#define PSI_CPP_SEARCH
+#include "php_psi_cpp.h"
 
 #if HAVE_LIBJIT
 # include "libjit.h"
@@ -25,1203 +52,450 @@
 
 ZEND_DECLARE_MODULE_GLOBALS(psi);
 
-PHP_INI_BEGIN()
-	STD_PHP_INI_ENTRY("psi.engine", PSI_ENGINE, PHP_INI_SYSTEM, OnUpdateString, engine, zend_psi_globals, psi_globals)
-	STD_PHP_INI_ENTRY("psi.directory", "psi.d", PHP_INI_SYSTEM, OnUpdateString, directory, zend_psi_globals, psi_globals)
-PHP_INI_END();
-
-static zend_object_handlers psi_object_handlers;
-static zend_class_entry *psi_class_entry;
-
-void psi_error_wrapper(PSI_Token *t, int type, const char *msg, ...)
-{
-	va_list argv;
-
-	va_start(argv, msg);
-	psi_verror(type, t?t->file:"Unknown", t?*t->line:0, msg, argv);
-	va_end(argv);
-}
-void psi_error(int type, const char *fn, unsigned ln, const char *msg, ...)
-{
-	va_list argv;
-
-	va_start(argv, msg);
-	psi_verror(type, fn, ln, msg, argv);
-	va_end(argv);
-}
-void psi_verror(int type, const char *fn, unsigned ln, const char *msg, va_list argv)
-{
-	zend_error_cb(type, fn, ln, msg, argv);
-}
-
-size_t psi_t_alignment(token_t t)
-{
-#define PSI_ALIGNOF(T) case PSI_T_## T: return ALIGNOF_## T ##_T;
-	switch (t) {
-	PSI_ALIGNOF(INT8);
-	PSI_ALIGNOF(UINT8);
-	PSI_ALIGNOF(INT16);
-	PSI_ALIGNOF(UINT16);
-	PSI_ALIGNOF(INT32);
-	PSI_ALIGNOF(UINT32);
-	PSI_ALIGNOF(INT64);
-	PSI_ALIGNOF(UINT64);
-	case PSI_T_FLOAT:
-		return ALIGNOF_FLOAT;
-	case PSI_T_DOUBLE:
-		return ALIGNOF_DOUBLE;
-	case PSI_T_POINTER:
-		return ALIGNOF_VOID_P;
-	EMPTY_SWITCH_DEFAULT_CASE();
-	}
-	return 0;
-}
-
-size_t psi_t_size(token_t t)
-{
-#define PSI_SIZEOF(T) case PSI_T_## T : return SIZEOF_## T ##_T;
-	switch (t) {
-	PSI_SIZEOF(INT8);
-	PSI_SIZEOF(UINT8);
-	PSI_SIZEOF(INT16);
-	PSI_SIZEOF(UINT16);
-	PSI_SIZEOF(INT32);
-	PSI_SIZEOF(UINT32);
-	PSI_SIZEOF(INT64);
-	PSI_SIZEOF(UINT64);
-	case PSI_T_FLOAT:
-		return SIZEOF_FLOAT;
-	case PSI_T_DOUBLE:
-		return SIZEOF_DOUBLE;
-	case PSI_T_POINTER:
-		return SIZEOF_VOID_P;
-	EMPTY_SWITCH_DEFAULT_CASE();
-	}
-	return 0;
-}
-
-size_t psi_t_align(token_t t, size_t s)
-{
-	size_t a = psi_t_alignment(t);
-	return ((s - 1) | (a - 1)) + 1;
-}
+//#define ZEND_INI_MH(name) int name(zend_ini_entry *entry, zend_string *new_value, void *mh_arg1, void *mh_arg2, void *mh_arg3, int stage)
 
-int psi_internal_type(impl_type *type)
+static void OnUpdateBlacklist(const char *str, void (*cb)(const char*, size_t))
 {
-	switch (type->type) {
-	case PSI_T_BOOL:
-		return _IS_BOOL;
-	case PSI_T_INT:
-		return IS_LONG;
-	case PSI_T_FLOAT:
-	case PSI_T_DOUBLE:
-		return IS_DOUBLE;
-	case PSI_T_STRING:
-		return IS_STRING;
-	case PSI_T_ARRAY:
-		return IS_ARRAY;
-	default:
-		return 0;
-	}
-}
-
-zend_internal_arg_info *psi_internal_arginfo(impl *impl)
-{
-	size_t i;
-	zend_internal_arg_info *aip;
-	zend_internal_function_info *fi;
-
-	aip = calloc(impl->func->args->count + 1 + !!impl->func->args->vararg.name, sizeof(*aip));
-
-	fi = (zend_internal_function_info *) &aip[0];
-	fi->allow_null = 1;
-	fi->required_num_args = psi_num_min_args(impl);
-	fi->return_reference = impl->func->return_reference;
-	fi->type_hint = psi_internal_type(impl->func->return_type);
-
-	if (impl->func->args->vararg.name) {
-		impl_arg *vararg = impl->func->args->vararg.name;
-		zend_internal_arg_info *ai = &aip[impl->func->args->count];
-
-		ai->name = vararg->var->name;
-		ai->type_hint = psi_internal_type(vararg->type);
-		if (vararg->var->reference) {
-			ai->pass_by_reference = 1;
-		}
-		ai->is_variadic = 1;
-	}
+	const char *end;
 
-	for (i = 0; i < impl->func->args->count; ++i) {
-		impl_arg *iarg = impl->func->args->args[i];
-		zend_internal_arg_info *ai = &aip[i+1];
+	do {
+		size_t len;
 
-		ai->name = iarg->var->name;
-		ai->type_hint = psi_internal_type(iarg->type);
-		if (iarg->var->reference) {
-			ai->pass_by_reference = 1;
+		end = strchr(str, ',');
+		if (end) {
+			len = end - str;
+		} else {
+			len = strlen(str);
 		}
-		if (iarg->var->reference || (iarg->def && iarg->def->type == PSI_T_NULL)) {
-			ai->allow_null = 1;
+		if (len) {
+			cb(str, len);
 		}
-	}
 
-	return aip;
+		str = end + 1;
+	} while (end);
 }
 
-size_t psi_num_min_args(impl *impl)
+static void psi_blacklist_add_decl(const char *pattern, size_t len);
+static ZEND_INI_MH(OnUpdateBlacklistedDecls)
 {
-	size_t i, n = impl->func->args->count;
-
-	for (i = 0; i < impl->func->args->count; ++i) {
-		if (impl->func->args->args[i]->def) {
-			--n;
-		}
-	}
-	return n;
+	OnUpdateBlacklist(new_value->val, psi_blacklist_add_decl);
+	return SUCCESS;
 }
 
-void psi_to_void(zval *return_value, set_value *set, impl_val *ret_val)
+static void psi_blacklist_add_var(const char *pattern, size_t len);
+static ZEND_INI_MH(OnUpdateBlacklistedVars)
 {
-	RETVAL_NULL();
+	OnUpdateBlacklist(new_value->val, psi_blacklist_add_var);
+	return SUCCESS;
 }
 
-void psi_to_bool(zval *return_value, set_value *set, impl_val *ret_val)
+static void OnDisplayBlacklist(struct psi_plist *bl)
 {
-	psi_to_int(return_value, set, ret_val);
-	convert_to_boolean(return_value);
-}
+	size_t i = 0;
+	char *item;
 
-void psi_to_int(zval *return_value, set_value *set, impl_val *ret_val)
-{
-	decl_var *var = set->vars->vars[0];
-	token_t t = real_decl_type(var->arg->type)->type;
-	impl_val *v = deref_impl_val(ret_val, var);
-
-	switch (t) {
-	case PSI_T_FLOAT:
-		RETVAL_DOUBLE((double) v->fval);
-		convert_to_long(return_value);
-		break;
-	case PSI_T_DOUBLE:
-		RETVAL_DOUBLE(v->dval);
-		convert_to_long(return_value);
-		break;
-	case PSI_T_INT8:
-		RETVAL_LONG(v->i8);
-		break;
-	case PSI_T_UINT8:
-		RETVAL_LONG(v->u8);
-		break;
-	case PSI_T_INT16:
-		RETVAL_LONG(v->i16);
-		break;
-	case PSI_T_UINT16:
-		RETVAL_LONG(v->u16);
-		break;
-	case PSI_T_INT32:
-		RETVAL_LONG(v->i32);
-		break;
-	case PSI_T_UINT32:
-#if UINT32_MAX >= ZEND_LONG_MAX
-		if (v->u32 > ZEND_LONG_MAX) {
-			char d[12] = {0};
-
-			RETVAL_STRING(zend_print_ulong_to_buf(&d[10], v->u32));
-		} else {
-#endif
-			RETVAL_LONG(v->u32);
-#if UINT32_MAX >= ZEND_LONG_MAX
-		}
-#endif
-		break;
-	case PSI_T_INT64:
-		RETVAL_LONG(v->i64);
-		break;
-	case PSI_T_UINT64:
-		if (v->u64 > ZEND_LONG_MAX) {
-			char d[24] = {0};
-
-			RETVAL_STRING(zend_print_ulong_to_buf(&d[22], v->u64));
-		} else {
-			RETVAL_LONG(v->u64);
+	while (psi_plist_get(bl, i++, &item)) {
+		if (i > 1) {
+			PUTS(",");
 		}
-		break;
-	EMPTY_SWITCH_DEFAULT_CASE();
+		PUTS(item);
 	}
 }
-
-void psi_to_double(zval *return_value, set_value *set, impl_val *ret_val)
+static ZEND_INI_DISP(OnDisplayBlacklistedDecls)
 {
-	decl_var *var = set->vars->vars[0];
-	token_t t = real_decl_type(var->arg->type)->type;
-	impl_val *v = deref_impl_val(ret_val, var);
-
-	switch (t) {
-	case PSI_T_FLOAT:
-		RETVAL_DOUBLE((double) v->fval);
-		break;
-	case PSI_T_DOUBLE:
-		RETVAL_DOUBLE(v->dval);
-		break;
-	case PSI_T_INT8:
-		RETVAL_DOUBLE((double) v->i8);
-		break;
-	case PSI_T_UINT8:
-		RETVAL_DOUBLE((double) v->u8);
-		break;
-	case PSI_T_INT16:
-		RETVAL_DOUBLE((double) v->i16);
-		break;
-	case PSI_T_UINT16:
-		RETVAL_DOUBLE((double) v->u16);
-		break;
-	case PSI_T_INT32:
-		RETVAL_DOUBLE((double) v->i32);
-		break;
-	case PSI_T_UINT32:
-		RETVAL_DOUBLE((double) v->u32);
-		break;
-	case PSI_T_INT64:
-		RETVAL_DOUBLE((double) v->i64);
-		break;
-	case PSI_T_UINT64:
-		RETVAL_DOUBLE((double) v->u64);
-		break;
-	EMPTY_SWITCH_DEFAULT_CASE();
-	}
+	OnDisplayBlacklist(PSI_G(blacklist).decls);
 }
-
-void psi_to_string(zval *return_value, set_value *set, impl_val *ret_val)
+static ZEND_INI_DISP(OnDisplayBlacklistedVars)
 {
-	decl_var *var = set->vars->vars[0];
-	token_t t = real_decl_type(var->arg->type)->type;
-
-	switch (t) {
-	case PSI_T_VOID:
-	case PSI_T_INT8:
-	case PSI_T_UINT8:
-		if (!var->arg->var->pointer_level) {
-			RETVAL_STRINGL(&ret_val->cval, 1);
-		} else {
-			ret_val = deref_impl_val(ret_val, var);
-			if (ret_val && ret_val->ptr) {
-				if (set->num) {
-					RETVAL_STRINGL(ret_val->ptr, psi_long_num_exp(set->num, set->outer.val));
-				} else {
-					RETVAL_STRING(ret_val->ptr);
-				}
-			} else {
-				RETVAL_EMPTY_STRING();
-			}
-		}
-		return;
-	case PSI_T_FLOAT:
-		RETVAL_DOUBLE((double) deref_impl_val(ret_val, var)->fval);
-		break;
-	case PSI_T_DOUBLE:
-		RETVAL_DOUBLE(deref_impl_val(ret_val, var)->dval);
-		break;
-	default:
-		psi_to_int(return_value, set, ret_val);
-		break;
-	}
-	convert_to_string(return_value);
+	OnDisplayBlacklist(PSI_G(blacklist).vars);
 }
 
+PHP_INI_BEGIN()
+	STD_PHP_INI_ENTRY("psi.engine", PSI_ENGINE, PHP_INI_SYSTEM, OnUpdateString, engine, zend_psi_globals, psi_globals)
+	STD_PHP_INI_ENTRY("psi.directory", "psi.d", PHP_INI_SYSTEM, OnUpdateString, directory, zend_psi_globals, psi_globals)
+	PHP_INI_ENTRY_EX("psi.blacklist.decls", "", PHP_INI_SYSTEM, OnUpdateBlacklistedDecls, OnDisplayBlacklistedDecls)
+	PHP_INI_ENTRY_EX("psi.blacklist.vars", "", PHP_INI_SYSTEM, OnUpdateBlacklistedVars, OnDisplayBlacklistedVars)
+PHP_INI_END();
 
-static impl_val *iterate(impl_val *val, size_t size, unsigned i, impl_val *tmp)
-{
-	memset(tmp, 0, sizeof(*tmp));
-	memcpy(tmp, ((void*) val->ptr) + size * i, size);
-	return tmp;
-}
+static zend_object_handlers psi_object_handlers;
+static zend_class_entry *psi_class_entry;
 
-void psi_from_zval(impl_val *mem, decl_arg *spec, zval *zv, void **tmp)
+zend_class_entry *psi_object_get_class_entry()
 {
-	decl_type *type = real_decl_type(spec->type);
-
-	switch (type->type) {
-	case PSI_T_FLOAT:
-		mem->fval = (float) zval_get_double(zv);
-		break;
-	case PSI_T_DOUBLE:
-		mem->dval = zval_get_double(zv);
-		break;
-	case PSI_T_INT8:
-	case PSI_T_UINT8:
-		if (spec->var->pointer_level) {
-			zend_string *zs = zval_get_string(zv);
-			*tmp = mem->ptr = estrndup(zs->val, zs->len);
-			zend_string_release(zs);
-			break;
-		}
-		/* no break */
-	default:
-		mem->zend.lval = zval_get_long(zv);
-		break;
-	}
+	return psi_class_entry;
 }
 
-void *psi_array_to_struct(decl_struct *s, HashTable *arr)
+static void psi_object_free(zend_object *o)
 {
-	size_t i, j = 0;
-	char *mem = ecalloc(1, s->size + s->args->count * sizeof(void *));
-
-	if (arr) for (i = 0; i < s->args->count; ++i) {
-		decl_arg *darg = s->args->args[i];
-		zval *entry = zend_hash_str_find_ind(arr, darg->var->name, strlen(darg->var->name));
-
-		if (entry) {
-			impl_val val;
-			void *tmp = NULL;
-
-			memset(&tmp, 0, sizeof(tmp));
-			psi_from_zval(&val, darg, entry, &tmp);
-			memcpy(mem + darg->layout->pos, &val, darg->layout->len);
-			if (tmp) {
-				((void **)(mem + s->size))[j++] = tmp;
-			}
+	psi_object *obj = PSI_OBJ(NULL, o);
+
+	if (obj->data) {
+		if (obj->dtor) {
+			obj->dtor(obj->data);
 		}
+		obj->data = NULL;
 	}
-	return mem;
+	zend_object_std_dtor(o);
 }
 
-void psi_to_array(zval *return_value, set_value *set, impl_val *r_val)
+zend_object *psi_object_init_ex(zend_class_entry *ce, void *data, void (*dtor)(void *))
 {
-	size_t i;
-	decl_var *var = set->vars->vars[0];
-	token_t t = real_decl_type(var->arg->type)->type;
-	impl_val tmp, *ret_val = deref_impl_val(r_val, var);
+	psi_object *o;
 
-	if ((intptr_t) ret_val->ptr <= (intptr_t) 0) {
-		RETURN_NULL();
+	if (!ce) {
+		ce = psi_class_entry;
 	}
 
-	array_init(return_value);
-
-	if (t == PSI_T_STRUCT) {
-		// decl_struct *s = real_decl_type(var->arg->type)->strct;
-
-		if (set->count) {
-			/* explicit member casts */
-			for (i = 0; i < set->count; ++i) {
-				set_value *sub_set = set->inner[i];
-				decl_var *sub_var = sub_set->vars->vars[0];
-
-				sub_set->outer.val = r_val;
+	o = ecalloc(1, sizeof(*o) + zend_object_properties_size(ce));
 
-				if (sub_var->arg) {
-					impl_val *tmp = NULL, *val;
-					zval ztmp;
-
-					val = deref_impl_val(struct_member_ref(sub_var->arg, ret_val, &tmp), sub_var);
-					sub_set->func->handler(&ztmp, sub_set, val);
-					add_assoc_zval(return_value, sub_var->name, &ztmp);
-
-					if (tmp) {
-						free(tmp);
-					}
-				}
-			}
-		}
-		return;
-	}
+	o->data = data;
+	o->dtor = dtor;
 
-	if (var->arg->var->array_size) {
-		/* to_array(foo[NUMBER]) */
-		for (i = 0; i < var->arg->var->array_size; ++i) {
-			size_t size = psi_t_size(var->arg->var->pointer_level > 1 ? PSI_T_POINTER : t);
-			impl_val *ptr = iterate(ret_val, size, i, &tmp);
-			zval ele;
-
-			switch (t) {
-			case PSI_T_FLOAT:
-				ZVAL_DOUBLE(&ele, (double) ptr->fval);
-				break;
-			case PSI_T_DOUBLE:
-				ZVAL_DOUBLE(&ele, ptr->dval);
-				break;
-			default:
-				ZVAL_LONG(&ele, ptr->lval);
-				break;
-			}
-
-			add_next_index_zval(return_value, &ele);
-		}
-		return;
-	} else if (set->num) {
-		/* to_array(arr_var, num_expr, to_int(*arr_var))
-		 */
-		zval ele;
-		zend_long i, n = psi_long_num_exp(set->num, set->outer.val);
-
-		for (i = 0; i < n; ++i) {
-			size_t size = psi_t_size(var->arg->var->pointer_level ? PSI_T_POINTER : t);
-			impl_val *ptr = iterate(ret_val, size, i, &tmp);
-
-			set->inner[0]->func->handler(&ele, set->inner[0], ptr);
-			add_next_index_zval(return_value, &ele);
-		}
-	} else {
-		ZEND_ASSERT(0);
-	}
+	zend_object_std_init(&o->std, ce);
+	object_properties_init(&o->std, ce);
+	o->std.handlers = &psi_object_handlers;
+	return &o->std;
 }
 
-void psi_to_object(zval *return_value, set_value *set, impl_val *r_val)
+zend_object *psi_object_init(zend_class_entry *ce)
 {
-	decl_var *var = set->vars->vars[0];
-	impl_val *ret_val = deref_impl_val(r_val, var);
-	psi_object *obj;
-
-	if ((intptr_t) ret_val->ptr > (intptr_t) 0) {
-		object_init_ex(return_value, psi_class_entry);
-		obj = PSI_OBJ(return_value, NULL);
-		obj->data = ret_val->ptr;
-	} else {
-		RETVAL_NULL();
-	}
+	return psi_object_init_ex(ce, NULL, NULL);
 }
 
-static inline ZEND_RESULT_CODE psi_parse_args(zend_execute_data *execute_data, impl *impl)
+ZEND_BEGIN_ARG_INFO_EX(ai_psi_dump, 0, 0, 0)
+	ZEND_ARG_INFO(0, stream)
+ZEND_END_ARG_INFO();
+static PHP_FUNCTION(psi_dump)
 {
-	size_t i;
-	impl_arg *iarg;
-	zend_error_handling zeh;
-
-	zend_replace_error_handling(EH_THROW, zend_exception_get_default(), &zeh);
-
-	if (!impl->func->args->count) {
-		ZEND_RESULT_CODE rv;
+	php_stream *s;
+	zval *r = NULL;
+	int fd = STDOUT_FILENO;
 
-		rv = zend_parse_parameters_none();
-		zend_restore_error_handling(&zeh);
-		return rv;
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "|r!", &r)) {
+		return;
 	}
+	if (r) {
+		php_stream_from_zval(s, r);
 
-	ZEND_PARSE_PARAMETERS_START(psi_num_min_args(impl), impl->func->args->vararg.name ? -1 : impl->func->args->count)
-	nextarg:
-		if (impl->func->args->vararg.name && _i >= impl->func->args->count) {
-			impl_arg *varg = impl->func->args->vararg.name;
-			iarg = init_impl_arg(
-					init_impl_type(varg->type->type, varg->type->name),
-					init_impl_var(varg->var->name, varg->var->reference),
-					NULL);
-
-			Z_PARAM_OPTIONAL;
-			if (_i == impl->func->args->count) {
-				impl->func->args->vararg.args = init_impl_args(iarg);
-			} else {
-				add_impl_arg(impl->func->args->vararg.args, iarg);
-			}
-		} else {
-			iarg = impl->func->args->args[_i];
-			if (iarg->def) {
-				Z_PARAM_OPTIONAL;
-			}
-		}
-		if (PSI_T_BOOL == iarg->type->type) {
-			Z_PARAM_BOOL(iarg->val.zend.bval);
-		} else if (PSI_T_INT == iarg->type->type) {
-			Z_PARAM_LONG(iarg->val.zend.lval);
-		} else if (PSI_T_FLOAT == iarg->type->type || PSI_T_DOUBLE == iarg->type->type) {
-			Z_PARAM_DOUBLE(iarg->val.dval);
-		} else if (PSI_T_STRING == iarg->type->type) {
-			Z_PARAM_STR_EX(iarg->val.zend.str, 1, iarg->var->reference);
-			if (iarg->val.zend.str) {
-				zend_string_addref(iarg->val.zend.str);
-			}
-		} else if (PSI_T_ARRAY == iarg->type->type) {
-			Z_PARAM_PROLOGUE(0);
-		} else if (PSI_T_OBJECT == iarg->type->type) {
-			Z_PARAM_PROLOGUE(0);
-		} else if (PSI_T_MIXED == iarg->type->type) {
-			Z_PARAM_PROLOGUE(0);
-		} else {
-			error_code = ZPP_ERROR_FAILURE;
-			break;
-		}
-		iarg->_zv = _arg;
-		ZVAL_DEREF(iarg->_zv);
-		if (_i < _num_args) {
-			goto nextarg;
-		}
-	ZEND_PARSE_PARAMETERS_END_EX(
-		zend_restore_error_handling(&zeh);
-		return FAILURE
-	);
-
-	/* set up defaults */
-	for (i = 0; i < impl->func->args->count; ++i) {
-		if (i >= EX_NUM_ARGS() && iarg->def) {
-			iarg = impl->func->args->args[i];
-
-			switch (iarg->type->type) {
-			case PSI_T_BOOL:
-				iarg->val.zend.bval = iarg->def->type == PSI_T_TRUE ? 1 : 0;
-				break;
-			case PSI_T_INT:
-				iarg->val.zend.lval = zend_atol(iarg->def->text, strlen(iarg->def->text));
-				break;
-			case PSI_T_FLOAT:
-			case PSI_T_DOUBLE:
-				iarg->val.dval = zend_strtod(iarg->def->text, NULL);
-				break;
-			case PSI_T_STRING:
-				/* FIXME */
-				iarg->val.zend.str = zend_string_init(&iarg->def->text[1], strlen(iarg->def->text) - 2, 0);
-				break;
-			}
+		if (SUCCESS != php_stream_cast(s, PHP_STREAM_AS_FD | PHP_STREAM_CAST_INTERNAL, (void **)&fd, 1)) {
+			RETURN_FALSE;
 		}
 	}
-
-	zend_restore_error_handling(&zeh);
-	return SUCCESS;
+	psi_context_dump(PSI_G(context), fd);
 }
 
-static inline void *psi_do_calloc(let_calloc *alloc)
+ZEND_BEGIN_ARG_INFO_EX(ai_psi_validate, 0, 0, 1)
+	ZEND_ARG_INFO(0, file)
+	ZEND_ARG_INFO(0, flags)
+	ZEND_ARG_INFO(1, errcnt)
+ZEND_END_ARG_INFO();
+static PHP_FUNCTION(psi_validate)
 {
-	zend_long n = psi_long_num_exp(alloc->nmemb, NULL), s = psi_long_num_exp(alloc->size, NULL);
-	void *mem = safe_emalloc(n, s, sizeof(void *));
-	memset(mem, 0, n * s + sizeof(void *));
-	return mem;
-}
+	zend_string *file;
+	struct psi_parser_input *I;
+	struct psi_parser P;
+	struct psi_data D = {0};
+	struct psi_validate_scope S = {0};
+	zend_long flags = 0;
+	zval *errcnt = NULL;
 
-static inline ZEND_RESULT_CODE psi_let_val(token_t let_func, impl_arg *iarg, impl_val *arg_val, decl_struct *strct, void **to_free)
-{
-	switch (let_func) {
-	case PSI_T_BOOLVAL:
-		if (iarg->type->type == PSI_T_BOOL) {
-			arg_val->cval = iarg->val.zend.bval;
-		} else {
-			arg_val->cval = zend_is_true(iarg->_zv);
-		}
-		break;
-	case PSI_T_INTVAL:
-		if (iarg->type->type == PSI_T_INT) {
-			arg_val->lval = iarg->val.zend.lval;
-		} else {
-			arg_val->lval = zval_get_long(iarg->_zv);
-		}
-		break;
-	case PSI_T_FLOATVAL:
-		if (iarg->type->type == PSI_T_FLOAT || iarg->type->type == PSI_T_DOUBLE) {
-			arg_val->dval = iarg->val.dval;
-		} else {
-			arg_val->dval = zval_get_double(iarg->_zv);
-		}
-		break;
-	case PSI_T_PATHVAL:
-	case PSI_T_STRVAL:
-		if (iarg->type->type == PSI_T_STRING) {
-			if (iarg->val.zend.str) {
-				arg_val->ptr = estrdup(iarg->val.zend.str->val);
-				*to_free = arg_val->ptr;
-			} else {
-				arg_val->ptr = "";
-			}
-		} else {
-			zend_string *zs = zval_get_string(iarg->_zv);
-			arg_val->ptr = estrdup(zs->val);
-			*to_free = arg_val->ptr;
-			zend_string_release(zs);
-		}
-		if (PSI_T_PATHVAL == let_func) {
-			if (SUCCESS != php_check_open_basedir(arg_val->ptr)) {
-				efree(arg_val->ptr);
-				return FAILURE;
-			}
-		}
-		break;
-	case PSI_T_STRLEN:
-		if (iarg->type->type == PSI_T_STRING) {
-			if (iarg->val.zend.str) {
-				arg_val->lval = iarg->val.zend.str->len;
-			} else {
-				arg_val->lval = 0;
-			}
-		} else {
-			zend_string *zs = zval_get_string(iarg->_zv);
-			arg_val->lval = zs->len;
-			zend_string_release(zs);
-		}
-		break;
-	case PSI_T_ARRVAL:
-		if (iarg->type->type == PSI_T_ARRAY) {
-			arg_val->ptr = psi_array_to_struct(strct, HASH_OF(iarg->_zv));
-			*to_free = arg_val->ptr;
-		}
-		break;
-	case PSI_T_OBJVAL:
-		if (iarg->type->type == PSI_T_OBJECT) {
-			psi_object *obj;
-
-			if (!instanceof_function(Z_OBJCE_P(iarg->_zv), psi_class_entry)) {
-				return FAILURE;
-			}
-
-			obj = PSI_OBJ(iarg->_zv, NULL);
-			arg_val->ptr = obj->data;
-		}
-		break;
-	EMPTY_SWITCH_DEFAULT_CASE();
+#if PHP_DEBUG
+	if (psi_check_env("PSI_DEBUG")) {
+		flags |= PSI_DEBUG;
 	}
-	return SUCCESS;
-}
+#endif
 
-static inline void *psi_do_let(let_stmt *let)
-{
-	decl_arg *darg = let->var->arg;
-	impl_val *arg_val = darg->ptr;
-	impl_arg *iarg;
-
-	switch (let->val ? let->val->kind : PSI_LET_NULL) {
-	case PSI_LET_TMP:
-		arg_val->ptr = deref_impl_val(let->val->data.var->arg->val.ptr, let->var);
-		break;
-	case PSI_LET_NULL:
-		if (darg->var->array_size) {
-			arg_val->ptr = ecalloc(darg->var->array_size, sizeof(*arg_val));
-			darg->mem = arg_val->ptr;
-		} else {
-			memset(arg_val, 0, sizeof(*arg_val));
-		}
-		break;
-	case PSI_LET_CALLOC:
-		arg_val->ptr = psi_do_calloc(let->val->data.alloc);
-		darg->mem = arg_val->ptr;
-		break;
-	case PSI_LET_NUMEXP:
-		arg_val->zend.lval = psi_long_num_exp(let->val->data.num, NULL);
-		break;
-	case PSI_LET_FUNC:
-		iarg = let->val->data.func->arg;
-
-		if (SUCCESS != psi_let_val(let->val->data.func->type, iarg, darg->ptr, real_decl_type(darg->type)->strct, &darg->mem)) {
-			return NULL;
-		}
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "P|lz", &file, &flags, &errcnt)) {
+		return;
 	}
 
-	if (let->val && let->val->flags.one.is_reference) {
-		return let->ptr = &darg->ptr;
-	} else {
-		return let->ptr = darg->ptr;
+	if (!psi_parser_init(&P, psi_error_wrapper, flags)) {
+		RETURN_FALSE;
+	}
+	if (!(I = psi_parser_open_file(&P, file->val, true))) {
+		psi_parser_dtor(&P);
+		RETURN_FALSE;
 	}
-}
-
-static inline void psi_do_set(zval *return_value, set_value *set)
-{
-	zval_dtor(return_value);
-	set->func->handler(return_value, set, set->vars->vars[0]->arg->ptr);
-}
-
-static inline void psi_do_return(zval *return_value, return_stmt *ret)
-{
-	ret->set->func->handler(return_value, ret->set, ret->set->vars->vars[0]->arg->ptr);
-}
-
-static inline void psi_do_free(free_stmt *fre)
-{
-	size_t i, j;
-
-	for (i = 0; i < fre->calls->count; ++i) {
-		free_call *f = fre->calls->list[i];
 
-		for (j = 0; j < f->vars->count; ++j) {
-			decl_var *dvar = f->vars->vars[j];
-			decl_arg *darg = dvar->arg;
+	psi_parser_parse(&P, I);
+	psi_data_ctor(&D, P.error, P.flags);
+	psi_validate_scope_ctor(&S);
+	S.defs = &P.preproc->defs;
 
-			f->decl->call.args[j] = &darg->val;
-		}
+	RETVAL_BOOL(psi_validate(&S, &D, PSI_DATA(&P)));
 
-		/* FIXME: check in validate_* that free functions return scalar */
-		PSI_ContextCall(&PSI_G(context), &f->decl->call, NULL);
+	if (errcnt) {
+		ZVAL_DEREF(errcnt);
+		convert_to_long(errcnt);
+		ZVAL_LONG(errcnt, P.errors);
 	}
+
+	psi_validate_scope_dtor(&S);
+	psi_data_dtor(&D);
+	psi_parser_dtor(&P);
+	psi_parser_input_free(&I);
 }
 
-static inline void psi_do_clean(impl *impl)
+ZEND_BEGIN_ARG_INFO_EX(ai_psi_validate_string, 0, 0, 1)
+	ZEND_ARG_INFO(0, string)
+	ZEND_ARG_INFO(0, flags)
+	ZEND_ARG_INFO(1, errcnt)
+ZEND_END_ARG_INFO();
+static PHP_FUNCTION(psi_validate_string)
 {
-	size_t i;
+	zend_string *string;
+	struct psi_parser_input *I;
+	struct psi_parser P;
+	struct psi_data D = {0};
+	struct psi_validate_scope S = {0};
+	zend_long flags = 0;
+	zval *errcnt = NULL;
 
-	for (i = 0; i < impl->func->args->count; ++i ) {
-		impl_arg *iarg = impl->func->args->args[i];
-
-		switch (iarg->type->type) {
-		case PSI_T_STRING:
-			if (iarg->val.zend.str) {
-				zend_string_release(iarg->val.zend.str);
-			}
-			break;
-		}
+#if PHP_DEBUG
+	if (psi_check_env("PSI_DEBUG")) {
+		flags |= PSI_DEBUG;
 	}
+#endif
 
-	if (impl->decl->args) for (i = 0; i < impl->decl->args->count; ++i) {
-		decl_arg *darg = impl->decl->args->args[i];
-
-		if (darg->mem) {
-			decl_type *type = real_decl_type(darg->type);
-
-			if (type->type == PSI_T_STRUCT) {
-				void **ptr = (void **) ((char *) darg->mem + type->strct->size);
-
-				while (*ptr) {
-					efree(*ptr++);
-				}
-			}
-			efree(darg->mem);
-			darg->mem = NULL;
-		}
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "S|lz", &string, &flags, &errcnt)) {
+		return;
 	}
 
-	if (impl->func->args->vararg.args) {
-		free_impl_args(impl->func->args->vararg.args);
-		impl->func->args->vararg.args = NULL;
-	}
-	if (impl->func->args->vararg.types) {
-		efree(impl->func->args->vararg.types);
-		impl->func->args->vararg.types = NULL;
+	if (!psi_parser_init(&P, psi_error_wrapper, flags)) {
+		RETURN_FALSE;
 	}
-	if (impl->func->args->vararg.values) {
-		efree(impl->func->args->vararg.values);
-		impl->func->args->vararg.values = NULL;
+	if (!(I = psi_parser_open_string(&P, string->val, string->len))) {
+		psi_parser_dtor(&P);
+		RETURN_FALSE;
 	}
-	if (impl->func->args->vararg.free_list) {
-		void **list = impl->func->args->vararg.free_list;
 
-		while (*list) {
-			efree(*list++);
-		}
+	psi_parser_parse(&P, I);
+	psi_data_ctor(&D, P.error, P.flags);
+	psi_validate_scope_ctor(&S);
+	S.defs = &P.preproc->defs;
+
+	RETVAL_BOOL(psi_validate(&S, &D, PSI_DATA(&P)));
 
-		efree(impl->func->args->vararg.free_list);
-		impl->func->args->vararg.free_list = NULL;
+	if (errcnt) {
+		ZVAL_DEREF(errcnt);
+		convert_to_long(errcnt);
+		ZVAL_LONG(errcnt, P.errors);
 	}
-}
 
-static inline int psi_calc_num_exp_value(num_exp *exp, impl_val *strct, impl_val *res) {
-	impl_val *ref, *tmp = NULL;
+	psi_validate_scope_dtor(&S);
+	psi_data_dtor(&D);
+	psi_parser_dtor(&P);
+	psi_parser_input_free(&I);
+}
 
-	switch (exp->t) {
-	case PSI_T_NUMBER:
-		switch (is_numeric_string(exp->u.numb, strlen(exp->u.numb), (zend_long *) res, (double *) res, 0)) {
-		case IS_LONG:
-			return PSI_T_INT64;
-		case IS_DOUBLE:
-			return PSI_T_DOUBLE;
-		}
-		break;
-
-	case PSI_T_NSNAME:
-		switch (exp->u.cnst->type->type) {
-		case PSI_T_INT:
-			res->i64 = zend_get_constant_str(exp->u.cnst->name, strlen(exp->u.cnst->name))->value.lval;
-			return PSI_T_INT64;
-		case PSI_T_FLOAT:
-			res->dval = zend_get_constant_str(exp->u.cnst->name, strlen(exp->u.cnst->name))->value.dval;
-			return PSI_T_DOUBLE;
-		default:
-			return 0;
-		}
-		break;
+static ZEND_RESULT_CODE psi_ops_load()
+{
+	struct psi_context_ops *ops = NULL;
+#ifdef HAVE_LIBJIT
+	if (!strcasecmp(PSI_G(engine), "jit")) {
+		ops = psi_libjit_ops();
+	} else
+#endif
+#ifdef HAVE_LIBFFI
+		ops = psi_libffi_ops();
+#endif
 
-	case PSI_T_NAME:
-		if (strct) {
-			ref = struct_member_ref(exp->u.dvar->arg, strct, &tmp);
-		} else {
-			ref = exp->u.dvar->arg->ptr;
-		}
-		switch (real_decl_type(exp->u.dvar->arg->type)->type) {
-		case PSI_T_INT8:
-		case PSI_T_UINT8:
-		case PSI_T_INT16:
-		case PSI_T_UINT16:
-		case PSI_T_INT32:
-		case PSI_T_UINT32:
-		case PSI_T_INT64:
-		case PSI_T_UINT64:
-			memcpy(res, deref_impl_val(ref, exp->u.dvar), sizeof(*res));
-			if (tmp) {
-				free(tmp);
-			}
-			return real_decl_type(exp->u.dvar->arg->type)->type;
-
-		case PSI_T_FLOAT:
-		case PSI_T_DOUBLE:
-			memcpy(res, deref_impl_val(ref, exp->u.dvar), sizeof(*res));
-			if (tmp) {
-				free(tmp);
-			}
-			return real_decl_type(exp->u.dvar->arg->type)->type;
-
-		EMPTY_SWITCH_DEFAULT_CASE();
-		}
-		break;
+	if (!ops) {
+		php_error(E_WARNING, "No PSI engine found");
+		return FAILURE;
+	}
 
-	EMPTY_SWITCH_DEFAULT_CASE();
+	PSI_G(ops) = ops;
+	if (ops->load) {
+		return ops->load();
 	}
-	return  0;
+	return SUCCESS;
 }
 
-int psi_calc_num_exp(num_exp *exp, impl_val *strct, impl_val *res) {
-	impl_val num = {0};
-	int num_type = psi_calc_num_exp_value(exp, strct, &num);
+PHP_MINIT_FUNCTION(psi_cpp);
+static PHP_MINIT_FUNCTION(psi)
+{
+	zend_class_entry ce = {0};
+	unsigned flags = 0;
 
-	if (exp->operand) {
-		impl_val tmp = {0};
-		int tmp_type = psi_calc_num_exp(exp->operand, strct, &tmp);
+	REGISTER_INI_ENTRIES();
 
-		return exp->calculator(num_type, &num, tmp_type, &tmp, res);
-	}
+	zend_register_long_constant(ZEND_STRL("PSI_DEBUG"), PSI_DEBUG, CONST_CS|CONST_PERSISTENT, module_number);
+	zend_register_long_constant(ZEND_STRL("PSI_SILENT"), PSI_SILENT, CONST_CS|CONST_PERSISTENT, module_number);
 
-	memcpy(res, &num, sizeof(*res));
-	return num_type;
-}
+	INIT_NS_CLASS_ENTRY(ce, "psi", "object", NULL);
+	psi_class_entry = zend_register_internal_class_ex(&ce, NULL);
+	psi_class_entry->create_object = psi_object_init;
 
-#define PRIfval "f"
-#define PRIdval "lf"
-
-#define PSI_CALC_OP(var) do { \
-	const char *fmt = "calc %" PRI##var ", %" PRI##var ": %" PRI##var "\n"; \
-	res->var = PSI_CALC(v1->var, v2->var); \
-	if (!res->var) fprintf(stderr, fmt, v1->var, v2->var, res->var); \
-} while (0)
-#define PSI_CALC_OP2(vres, var1, var2) do { \
-	const char *fmt = "calc %" PRI##var1 ", %" PRI##var2 ": %" PRI##vres "\n"; \
-	res->vres = PSI_CALC(v1->var1, v2->var2); \
-	if (!res->vres) fprintf(stderr, fmt, v1->var1, v2->var2, res->vres); \
-} while(0)
-#define PSI_CALC_FN(op) int psi_calc_##op(int t1, impl_val *v1, int t2, impl_val *v2, impl_val *res) \
-{ \
-	if (t1 == t2) { \
-		switch (t1) { \
-		case PSI_T_FLOAT:	PSI_CALC_OP(fval);	break; \
-		case PSI_T_DOUBLE:	PSI_CALC_OP(dval);	break; \
-		case PSI_T_INT8:	PSI_CALC_OP(i8);	break; \
-		case PSI_T_UINT8:	PSI_CALC_OP(u8);	break; \
-		case PSI_T_INT16:	PSI_CALC_OP(i16);	break; \
-		case PSI_T_UINT16:	PSI_CALC_OP(u16);	break; \
-		case PSI_T_INT32:	PSI_CALC_OP(i32);	break; \
-		case PSI_T_UINT32:	PSI_CALC_OP(u32);	break; \
-		case PSI_T_INT64:	PSI_CALC_OP(i64);	break; \
-		case PSI_T_UINT64:	PSI_CALC_OP(u64);	break; \
-		EMPTY_SWITCH_DEFAULT_CASE(); \
-		} \
-		return t1; \
-	} else if (t1 == PSI_T_DOUBLE) { \
-		switch (t2) { \
-		case PSI_T_FLOAT:	PSI_CALC_OP2(dval, dval, fval);	break; \
-		case PSI_T_INT8:	PSI_CALC_OP2(dval, dval, i8);	break; \
-		case PSI_T_UINT8:	PSI_CALC_OP2(dval, dval, u8);	break; \
-		case PSI_T_INT16:	PSI_CALC_OP2(dval, dval, i16);	break; \
-		case PSI_T_UINT16:	PSI_CALC_OP2(dval, dval, u16);	break; \
-		case PSI_T_INT32:	PSI_CALC_OP2(dval, dval, i32);	break; \
-		case PSI_T_UINT32:	PSI_CALC_OP2(dval, dval, u32);	break; \
-		case PSI_T_INT64:	PSI_CALC_OP2(dval, dval, i64);	break; \
-		case PSI_T_UINT64:	PSI_CALC_OP2(dval, dval, u64);	break; \
-		EMPTY_SWITCH_DEFAULT_CASE(); \
-		} \
-		return t1; \
-	} else if (t2 == PSI_T_DOUBLE) { \
-		switch (t1) { \
-		case PSI_T_FLOAT:	PSI_CALC_OP2(dval, fval, dval);	break; \
-		case PSI_T_INT8:	PSI_CALC_OP2(dval, i8, dval);	break; \
-		case PSI_T_UINT8:	PSI_CALC_OP2(dval, u8, dval);	break; \
-		case PSI_T_INT16:	PSI_CALC_OP2(dval, i16, dval);	break; \
-		case PSI_T_UINT16:	PSI_CALC_OP2(dval, u16, dval);	break; \
-		case PSI_T_INT32:	PSI_CALC_OP2(dval, i32, dval);	break; \
-		case PSI_T_UINT32:	PSI_CALC_OP2(dval, u32, dval);	break; \
-		case PSI_T_INT64:	PSI_CALC_OP2(dval, i64, dval);	break; \
-		case PSI_T_UINT64:	PSI_CALC_OP2(dval, u64, dval);	break; \
-		EMPTY_SWITCH_DEFAULT_CASE(); \
-		} \
-		return t2; \
-	} else if (t1 == PSI_T_FLOAT) { \
-		switch (t2) { \
-		case PSI_T_DOUBLE:	PSI_CALC_OP2(dval, fval, dval);	return t2; \
-		case PSI_T_INT8:	PSI_CALC_OP2(fval, fval, i8);	break; \
-		case PSI_T_UINT8:	PSI_CALC_OP2(fval, fval, u8);	break; \
-		case PSI_T_INT16:	PSI_CALC_OP2(fval, fval, i16);	break; \
-		case PSI_T_UINT16:	PSI_CALC_OP2(fval, fval, u16);	break; \
-		case PSI_T_INT32:	PSI_CALC_OP2(fval, fval, i32);	break; \
-		case PSI_T_UINT32:	PSI_CALC_OP2(fval, fval, u32);	break; \
-		case PSI_T_INT64:	PSI_CALC_OP2(fval, fval, i64);	break; \
-		case PSI_T_UINT64:	PSI_CALC_OP2(fval, fval, u64);	break; \
-		EMPTY_SWITCH_DEFAULT_CASE(); \
-		} \
-		return t1; \
-	} else if (t2 == PSI_T_FLOAT) { \
-		switch (t1) { \
-		case PSI_T_DOUBLE:	PSI_CALC_OP2(dval, dval, fval);	return t1; \
-		case PSI_T_INT8:	PSI_CALC_OP2(fval, i8, fval);	break; \
-		case PSI_T_UINT8:	PSI_CALC_OP2(fval, u8, fval);	break; \
-		case PSI_T_INT16:	PSI_CALC_OP2(fval, i16, fval);	break; \
-		case PSI_T_UINT16:	PSI_CALC_OP2(fval, u16, fval);	break; \
-		case PSI_T_INT32:	PSI_CALC_OP2(fval, i32, fval);	break; \
-		case PSI_T_UINT32:	PSI_CALC_OP2(fval, u32, fval);	break; \
-		case PSI_T_INT64:	PSI_CALC_OP2(fval, i64, fval);	break; \
-		case PSI_T_UINT64:	PSI_CALC_OP2(fval, u64, fval);	break; \
-		EMPTY_SWITCH_DEFAULT_CASE(); \
-		} \
-		return t2; \
-	} else { \
-		int64_t sval1 = v1->i64, sval2 = v2->i64; \
-		uint64_t uval1 = v1->u64, uval2 = v2->u64; \
-		switch (t1) { \
-		case PSI_T_INT8:	sval1 >>= 8; \
-		case PSI_T_INT16:	sval1 >>= 8; \
-		case PSI_T_INT32:	sval1 >>= 8; \
-		case PSI_T_INT64: \
-			switch (t2) { \
-			case PSI_T_INT8:	sval2 >>= 8; \
-			case PSI_T_INT16:	sval2 >>= 8; \
-			case PSI_T_INT32:	sval2 >>= 8; \
-			case PSI_T_INT64: \
-				res->i64 = PSI_CALC(sval1 , sval2); \
-				return PSI_T_INT64; \
-			case PSI_T_UINT8:	uval2 >>= 8; \
-			case PSI_T_UINT16:	uval2 >>= 8; \
-			case PSI_T_UINT32:	uval2 >>= 8; \
-			case PSI_T_UINT64: \
-				res->i64 = PSI_CALC(sval1, uval2); \
-				return PSI_T_INT64; \
-			} \
-			break; \
-		case PSI_T_UINT8:	uval1 >>= 8; \
-		case PSI_T_UINT16:	uval1 >>= 8; \
-		case PSI_T_UINT32:	uval1 >>= 8; \
-		case PSI_T_UINT64: \
-			switch (t2) { \
-			case PSI_T_INT8:	sval2 >>= 8; \
-			case PSI_T_INT16:	sval2 >>= 8; \
-			case PSI_T_INT32:	sval2 >>= 8; \
-			case PSI_T_INT64: \
-				res->i64 = PSI_CALC(uval1, sval2); \
-				return PSI_T_INT64; \
-			case PSI_T_UINT8:	uval2 >>= 8; \
-			case PSI_T_UINT16:	uval2 >>= 8; \
-			case PSI_T_UINT32:	uval2 >>= 8; \
-			case PSI_T_UINT64: \
-				res->u64 = PSI_CALC(uval1, uval2); \
-				return PSI_T_UINT64; \
-			} \
-			break; \
-		} \
-	} \
-	ZEND_ASSERT(0); \
-	return 0; \
-}
+	memcpy(&psi_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
+	psi_object_handlers.offset = XtOffsetOf(psi_object, std);
+	psi_object_handlers.free_obj = psi_object_free;
+	psi_object_handlers.clone_obj = NULL;
 
-#undef PSI_CALC
-#define PSI_CALC(var1, var2) (var1) + (var2)
-PSI_CALC_FN(add)
-#undef PSI_CALC
-#define PSI_CALC(var1, var2) (var1) * (var2)
-PSI_CALC_FN(mul)
-#undef PSI_CALC
-#define PSI_CALC(var1, var2) (var1) - (var2)
-PSI_CALC_FN(sub)
-#undef PSI_CALC
-#define PSI_CALC(var1, var2) (var1) / (var2)
-PSI_CALC_FN(div)
-
-static inline void psi_do_args(impl *impl) {
-	size_t i;
-
-	for (i = 0; i < impl->decl->args->count; ++i) {
-		impl->decl->call.args[i] = impl->decl->args->args[i]->let->ptr;
+	if (SUCCESS != PHP_MINIT(psi_cpp)(type, module_number)) {
+		return FAILURE;
 	}
-}
-
-static inline impl_vararg *psi_do_varargs(impl *impl) {
-	size_t i, j;
-	impl_vararg *va = &impl->func->args->vararg;
-	size_t vacount = va->args->count;
-
 
-	if (!vacount) {
-		return NULL;
+	if (SUCCESS != psi_ops_load()) {
+		return FAILURE;
 	}
 
-	va->types = ecalloc(vacount, sizeof(*va->types));
-	va->values = ecalloc(vacount, sizeof(*va->values));
-
-	for (i = 0, j = 0; i < vacount; ++i) {
-		impl_arg *vaarg = va->args->args[i];
-		void *to_free = NULL;
-		token_t let_fn, vatype = va->name->type->type;
-
-		if (vatype == PSI_T_MIXED) {
-			switch (Z_TYPE_P(vaarg->_zv)) {
-			case IS_TRUE:
-			case IS_FALSE:	vatype = PSI_T_BOOL;	break;
-			case IS_LONG:	vatype = PSI_T_INT;		break;
-			case IS_DOUBLE:	vatype = PSI_T_FLOAT;	break;
-			default:		vatype = PSI_T_STRING;	break;
-			}
-		}
-
-
-		switch (vatype) {
-		case PSI_T_BOOL:	let_fn = PSI_T_BOOLVAL;	break;
-		case PSI_T_INT:		let_fn = PSI_T_INTVAL;	break;
-		case PSI_T_FLOAT:
-		case PSI_T_DOUBLE:	let_fn = PSI_T_FLOATVAL;break;
-		case PSI_T_STRING:	let_fn = PSI_T_STRVAL;	break;
-		EMPTY_SWITCH_DEFAULT_CASE();
-		}
+	if (psi_check_env("PSI_DEBUG")) {
+		flags |= PSI_DEBUG;
+	}
+	if (psi_check_env("PSI_SILENT")) {
+		flags |= PSI_SILENT;
+	}
 
-		va->types[i] = vatype;
-		psi_let_val(let_fn, vaarg, &va->values[i], NULL, &to_free);
+	PSI_G(search_path) = pemalloc(strlen(PSI_G(directory)) + strlen(psi_cpp_search) + 1 + 1, 1);
+	sprintf(PSI_G(search_path), "%s:%s", PSI_G(directory), psi_cpp_search);
 
-		if (to_free) {
-			if (!va->free_list) {
-				va->free_list = ecalloc(vacount - i + 1, sizeof(*va->free_list));
-			}
-			va->free_list[j++] = to_free;
-		}
-	}
+	PSI_G(context) = psi_context_init(NULL, PSI_G(ops), psi_error_wrapper, flags);
+	psi_context_build(PSI_G(context), PSI_G(directory));
 
-	return va;
+	return SUCCESS;
 }
 
-void psi_call(zend_execute_data *execute_data, zval *return_value, impl *impl)
+PHP_MSHUTDOWN_FUNCTION(psi_cpp);
+static PHP_MSHUTDOWN_FUNCTION(psi)
 {
-	size_t i;
-	impl_vararg *va = NULL;
-
-	memset(impl->decl->func->ptr, 0, sizeof(impl_val));
-
-	if (SUCCESS != psi_parse_args(execute_data, impl)) {
-		return;
+	if (psi_check_env("PSI_DUMP")) {
+		psi_context_dump(PSI_G(context), STDOUT_FILENO);
 	}
 
-	for (i = 0; i < impl->stmts->let.count; ++i) {
-		let_stmt *let = impl->stmts->let.list[i];
+	psi_context_free(&PSI_G(context));
 
-		if (!psi_do_let(let)) {
-			psi_do_return(return_value, impl->stmts->ret.list[0]);
-			psi_do_clean(impl);
-			return;
-		}
+	if (PSI_G(ops)->free) {
+		PSI_G(ops)->free();
 	}
 
-	if (impl->decl->args) {
-		psi_do_args(impl);
+	PHP_MSHUTDOWN(psi_cpp)(type, module_number);
 
-		if (impl->func->args->vararg.args) {
-			va = psi_do_varargs(impl);
-		}
-	}
+	UNREGISTER_INI_ENTRIES();
 
-	PSI_ContextCall(&PSI_G(context), &impl->decl->call, va);
-	psi_do_return(return_value, impl->stmts->ret.list[0]);
+	return SUCCESS;
+}
 
-	for (i = 0; i < impl->stmts->set.count; ++i) {
-		set_stmt *set = impl->stmts->set.list[i];
+#if defined(COMPILE_DL_PSI) && defined(ZTS)
+static PHP_RINIT_FUNCTION(psi)
+{
+	ZEND_TSRMLS_CACHE_UPDATE();
+	return SUCCESS;
+}
+#endif
 
-		if (set->arg->_zv) {
-			psi_do_set(set->arg->_zv, set->val);
-		}
-	}
+static PHP_MINFO_FUNCTION(psi)
+{
+	php_info_print_table_start();
+	php_info_print_table_header(2, "PSI Support", "enabled");
+	php_info_print_table_row(2, "Extension Version", PHP_PSI_VERSION);
+	php_info_print_table_row(2, "Search Path", PSI_G(search_path));
+	php_info_print_table_end();
 
-	for (i = 0; i < impl->stmts->fre.count; ++i) {
-		free_stmt *fre = impl->stmts->fre.list[i];
+	php_info_print_table_start();
+	php_info_print_table_header(3, "Used Library", "Compiled", "Linked");
+	php_info_print_table_row(3, "libffi",
+#ifndef PHP_PSI_LIBFFI_VERSION
+# define PHP_PSI_LIBFFI_VERSION "unknown"
+#endif
+#ifdef HAVE_LIBFFI
+			PHP_PSI_LIBFFI_VERSION, "unknown"
+#else
+			"disabled", "disabled"
+#endif
+	);
+	php_info_print_table_row(3, "libjit",
+#ifdef HAVE_LIBJIT
+			"unknown", "unknown"
+#else
+			"disabled", "disabled"
+#endif
+	);
 
-		psi_do_free(fre);
-	}
-	psi_do_clean(impl);
+	DISPLAY_INI_ENTRIES();
 }
 
-static void psi_object_free(zend_object *o)
+static void ptr_free(void *ptr)
 {
-	psi_object *obj = PSI_OBJ(NULL, o);
-
-	if (obj->data) {
-		// free(obj->data);
-		obj->data = NULL;
-	}
-	zend_object_std_dtor(o);
+	free(*(void **) ptr);
 }
 
-static zend_object *psi_object_init(zend_class_entry *ce)
+static void psi_blacklist_add_decl(const char *pattern, size_t len)
 {
-	psi_object *o = ecalloc(1, sizeof(*o) + zend_object_properties_size(ce));
+	char *tmp = strndup(pattern, len);
+	struct psi_plist **decls = &PSI_G(blacklist).decls;
 
-	zend_object_std_init(&o->std, ce);
-	object_properties_init(&o->std, ce);
-	o->std.handlers = &psi_object_handlers;
-	return &o->std;
+	*decls = psi_plist_add(*decls, &tmp);
 }
 
-PHP_MINIT_FUNCTION(psi)
+static void psi_blacklist_add_var(const char *pattern, size_t len)
 {
-	PSI_ContextOps *ops = NULL;
-	zend_class_entry ce = {0};
+	char *tmp = strndup(pattern, len);
+	struct psi_plist **vars = &PSI_G(blacklist).vars;
 
-	REGISTER_INI_ENTRIES();
-
-	INIT_NS_CLASS_ENTRY(ce, "psi", "object", NULL);
-	psi_class_entry = zend_register_internal_class_ex(&ce, NULL);
-	psi_class_entry->create_object = psi_object_init;
-
-	memcpy(&psi_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
-	psi_object_handlers.offset = XtOffsetOf(psi_object, std);
-	psi_object_handlers.free_obj = psi_object_free;
-	psi_object_handlers.clone_obj = NULL;
+	*vars = psi_plist_add(*vars, &tmp);
+}
 
-#ifdef HAVE_LIBJIT
-	if (!strcasecmp(PSI_G(engine), "jit")) {
-		ops = PSI_Libjit();
-	} else
-#endif
-#ifdef HAVE_LIBFFI
-		ops = PSI_Libffi();
-#endif
+static PHP_GINIT_FUNCTION(psi)
+{
+	char *tmp;
+	struct psi_plist **bl_decls = &psi_globals->blacklist.decls;
+	struct psi_plist **bl_vars = &psi_globals->blacklist.vars;
 
-	if (!ops) {
-		php_error(E_WARNING, "No PSI engine found");
-		return FAILURE;
-	}
+	*bl_decls = psi_plist_init(ptr_free);
+	*bl_vars = psi_plist_init(ptr_free);
 
-	PSI_ContextInit(&PSI_G(context), ops, psi_error_wrapper);
-	PSI_ContextBuild(&PSI_G(context), PSI_G(directory));
+#define BL_ADD(D, d) \
+	tmp = strdup(d); \
+	*D = psi_plist_add(*D, &tmp)
+#define BL_DECL_ADD(d) BL_ADD(bl_decls, d)
+#define BL_VAR_ADD(d) BL_ADD(bl_vars, d)
 
-	if (psi_check_env("PSI_DUMP")) {
-		PSI_ContextDump(&PSI_G(context), STDOUT_FILENO);
-	}
+	BL_DECL_ADD("dlsym");
+	BL_DECL_ADD("alloca");
+	BL_DECL_ADD("atexit");
+	BL_DECL_ADD("at_quick_exit");
 
-	return SUCCESS;
-}
+	/* missing */
+	BL_DECL_ADD("_IO_cookie_init");
+	BL_DECL_ADD("bindresvport6");
 
-PHP_MSHUTDOWN_FUNCTION(psi)
-{
-	PSI_ContextDtor(&PSI_G(context));
+	/* va_list as arg */
+	BL_DECL_ADD("*v*printf");
+	BL_DECL_ADD("*v*scanf");
+	BL_DECL_ADD("vsyslog");
 
-	UNREGISTER_INI_ENTRIES();
+	/* LFS/LFO for 32bit */
+	BL_DECL_ADD("*stat*64");
+	BL_DECL_ADD("*glob*64");
+	/* Hurd only */
+	BL_DECL_ADD("getumask");
 
-	return SUCCESS;
+	/* using hidden structs */
+	BL_VAR_ADD("_IO_2_*");
 }
 
-#if defined(COMPILE_DL_PSI) && defined(ZTS)
-PHP_RINIT_FUNCTION(psi)
+static PHP_GSHUTDOWN_FUNCTION(psi)
 {
-	ZEND_TSRMLS_CACHE_UPDATE();
-	return SUCCESS;
+	psi_plist_free(psi_globals->blacklist.decls);
 }
-#endif
 
-PHP_MINFO_FUNCTION(psi)
-{
-	php_info_print_table_start();
-	php_info_print_table_header(2, "psi support", "enabled");
-	php_info_print_table_end();
-
-	DISPLAY_INI_ENTRIES();
-}
-const zend_function_entry psi_functions[] = {
+static const zend_function_entry psi_functions[] = {
+	PHP_FE(psi_dump, ai_psi_dump)
+	PHP_FE(psi_validate, ai_psi_validate)
+	PHP_FE(psi_validate_string, ai_psi_validate_string)
 	PHP_FE_END
 };
 
+static const zend_module_dep psi_deps[] = {
+	ZEND_MOD_REQUIRED("standard")
+	{0}
+};
+
 zend_module_entry psi_module_entry = {
-	STANDARD_MODULE_HEADER,
+	STANDARD_MODULE_HEADER_EX,
+	NULL,
+	psi_deps,
 	"psi",
 	psi_functions,
 	PHP_MINIT(psi),
@@ -1234,7 +508,11 @@ zend_module_entry psi_module_entry = {
 	NULL,
 	PHP_MINFO(psi),
 	PHP_PSI_VERSION,
-	STANDARD_MODULE_PROPERTIES
+	ZEND_MODULE_GLOBALS(psi),
+	PHP_GINIT(psi),
+	PHP_GSHUTDOWN(psi),
+	NULL, /* post-deactivate */
+	STANDARD_MODULE_PROPERTIES_EX
 };
 
 #ifdef COMPILE_DL_PSI