X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fmodule.c;h=aff784dbc28235c13f65583f69c58f6962638d25;hp=e3658a7ac9a52e0db41e0e19db598759f9857e00;hb=d3171526ab7658114cac4ebe1098af4b038e576e;hpb=d60f4bbdd315ddf42dbafeff0fd3d87d2e7a51f7

diff --git a/src/module.c b/src/module.c
index e3658a7..aff784d 100644
--- a/src/module.c
+++ b/src/module.c
@@ -1,665 +1,201 @@
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "php.h"
 #include "php_ini.h"
 #include "ext/standard/info.h"
+#include "zend_constants.h"
+#include "zend_operators.h"
 
 #include "php_psi.h"
-#include "parser.h"
 
-#include "libjit.h"
-#include "libffi.h"
+#if HAVE_LIBJIT
+# include "libjit.h"
+# ifndef HAVE_LIBFFI
+#  define PSI_ENGINE "jit"
+# endif
+#endif
+#if HAVE_LIBFFI
+# include "libffi.h"
+# define PSI_ENGINE "ffi"
+#endif
 
 ZEND_DECLARE_MODULE_GLOBALS(psi);
 
 PHP_INI_BEGIN()
-	STD_PHP_INI_ENTRY("psi.engine", "ffi", PHP_INI_SYSTEM, OnUpdateString, engine, zend_psi_globals, psi_globals)
-	STD_PHP_INI_ENTRY("psi.directory", "psis", PHP_INI_SYSTEM, OnUpdateString, directory, zend_psi_globals, psi_globals)
+	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();
 
-void psi_error(int type, const char *msg, ...)
-{
-	char buf[0x1000];
-	va_list argv;
-
-	va_start(argv, msg);
-	vslprintf(buf, 0x1000, msg, argv);
-	va_end(argv);
-
-	php_error(type, buf);
-}
-
-int psi_internal_type(impl_type *type)
-{
-	switch (type->type) {
-	case PSI_T_BOOL:
-		return _IS_BOOL;
-	case PSI_T_INT:
-	case PSI_T_LONG:
-		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, sizeof(*aip));
-
-	fi = (zend_internal_function_info *) &aip[0];
-	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);
-
-	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];
-
-		ai->name = iarg->var->name;
-		ai->type_hint = psi_internal_type(iarg->type);
-		if (iarg->var->reference) {
-			ai->pass_by_reference = 1;
-		}
-		if (iarg->var->reference || (iarg->def && iarg->def->type == PSI_T_NULL)) {
-			ai->allow_null = 1;
-		}
-	}
-
-	return aip;
-}
-
-size_t psi_num_min_args(impl *impl)
-{
-	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;
-}
-
-void psi_to_int(zval *return_value, token_t t, impl_val *ret_val, decl_var *var)
-{
-	switch (t) {
-	case PSI_T_FLOAT:
-		RETVAL_DOUBLE((double) deref_impl_val(ret_val, var)->fval);
-		convert_to_long(return_value);
-		break;
-	case PSI_T_DOUBLE:
-		RETVAL_DOUBLE(deref_impl_val(ret_val, var)->dval);
-		convert_to_long(return_value);
-		break;
-	default:
-		RETVAL_LONG(deref_impl_val(ret_val, var)->lval);
-	}
-}
+static zend_object_handlers psi_object_handlers;
+static zend_class_entry *psi_class_entry;
 
-void psi_to_double(zval *return_value, token_t t, impl_val *ret_val, decl_var *var)
+zend_class_entry *psi_object_get_class_entry()
 {
-	switch (t) {
-	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:
-		RETVAL_DOUBLE((double) deref_impl_val(ret_val, var)->lval);
-		break;
-	}
+	return psi_class_entry;
 }
 
-void psi_to_string(zval *return_value, token_t t, impl_val *ret_val, decl_var *var)
+void psi_error_wrapper(void *context, PSI_Token *t, int type, const char *msg, ...)
 {
-	switch (t) {
-	case PSI_T_CHAR:
-	case PSI_T_SINT8:
-	case PSI_T_UINT8:
-		if (var->pointer_level == var->arg->var->pointer_level) {
-			RETVAL_STRINGL(&ret_val->cval, 1);
-		} else {
-			ret_val = deref_impl_val(ret_val, var);
-			if (ret_val->ptr) {
-				RETVAL_STRING(ret_val->ptr);
-			} else {
-				RETVAL_EMPTY_STRING();
-			}
-		}
-		break;
-	case PSI_T_FLOAT:
-		RETVAL_DOUBLE((double) deref_impl_val(ret_val, var)->fval);
-		convert_to_string(return_value);
-		break;
-	case PSI_T_DOUBLE:
-		RETVAL_DOUBLE(deref_impl_val(ret_val, var)->dval);
-		convert_to_string(return_value);
-		break;
-	default:
-		RETVAL_LONG(deref_impl_val(ret_val, var)->lval);
-		convert_to_string(return_value);
-		break;
-	}
-}
+	va_list argv;
+	const char *fn = NULL;
+	unsigned ln = 0;
 
-size_t psi_t_alignment(token_t t)
-{
-	size_t align;
-#define PSI_TAS_D(T) struct PSI_TAS_ ##T { \
-	char c; \
-	T x; \
-}
-#define PSI_TAS_P(T) struct PSI_TAS_ ## T ## _pointer { \
-	char c; \
-	T *x; \
-}
-#define PSI_TAS_C(T) align = offsetof(struct PSI_TAS_ ##T, x)
-#define PSI_TAS_CASE(T) { \
-	PSI_TAS_D(T); \
-	PSI_TAS_C(T); \
-}
-	switch (t) {
-	case PSI_T_CHAR:
-		PSI_TAS_CASE(char);
-		break;
-	case PSI_T_SINT8:
-		PSI_TAS_CASE(int8_t);
-		break;
-	case PSI_T_UINT8:
-		PSI_TAS_CASE(uint8_t);
-		break;
-	case PSI_T_SHORT:
-		PSI_TAS_CASE(short);
-		break;
-	case PSI_T_SINT16:
-		PSI_TAS_CASE(int16_t);
-		break;
-	case PSI_T_UINT16:
-		PSI_TAS_CASE(uint16_t);
-		break;
-	case PSI_T_INT:
-		PSI_TAS_CASE(int);
-		break;
-	case PSI_T_SINT32:
-		PSI_TAS_CASE(int32_t);
-		break;
-	case PSI_T_UINT32:
-		PSI_TAS_CASE(uint32_t);
-		break;
-	case PSI_T_LONG:
-		PSI_TAS_CASE(long);
-		break;
-	case PSI_T_SINT64:
-		PSI_TAS_CASE(int64_t);
-		break;
-	case PSI_T_UINT64:
-		PSI_TAS_CASE(uint64_t);
-		break;
-	case PSI_T_FLOAT:
-		PSI_TAS_CASE(float);
-		break;
-	case PSI_T_DOUBLE:
-		PSI_TAS_CASE(double);
-		break;
-	case PSI_T_SIZE_T:
-		PSI_TAS_CASE(size_t);
-		break;
-	case PSI_T_POINTER:
-		{
-			PSI_TAS_P(char);
-			PSI_TAS_C(char_pointer);
+	if (context) {
+		if (PSI_DATA(context)->flags & PSI_PARSER_SILENT) {
+			return;
 		}
-		break;
-	EMPTY_SWITCH_DEFAULT_CASE();
 	}
 
-	return align;
-}
-
-size_t psi_t_size(token_t t)
-{
-	size_t size;
-
-	switch (t) {
-	case PSI_T_CHAR:
-		size = sizeof(char);
-		break;
-	case PSI_T_SINT8:
-	case PSI_T_UINT8:
-		size = 1;
-		break;
-	case PSI_T_SHORT:
-		size = sizeof(short);
-		break;
-	case PSI_T_SINT16:
-	case PSI_T_UINT16:
-		size = 2;
-		break;
-	case PSI_T_INT:
-		size = sizeof(int);
-		break;
-	case PSI_T_SINT32:
-	case PSI_T_UINT32:
-		size = 4;
-		break;
-	case PSI_T_LONG:
-		size = sizeof(long);
-		break;
-	case PSI_T_SINT64:
-	case PSI_T_UINT64:
-		size = 8;
-		break;
-	case PSI_T_FLOAT:
-		size = sizeof(float);
-		break;
-	case PSI_T_DOUBLE:
-		size = sizeof(double);
-		break;
-	case PSI_T_SIZE_T:
-		size = sizeof(size_t);
-		break;
-	case PSI_T_POINTER:
-		size = sizeof(char *);
-		break;
-	EMPTY_SWITCH_DEFAULT_CASE();
+	if (t) {
+		fn = t->file;
+		ln = t->line;
+	} else if (zend_is_executing()) {
+		fn = zend_get_executed_filename();
+		ln = zend_get_executed_lineno();
+	} else if (zend_is_compiling()) {
+		fn = zend_get_compiled_filename()->val;
+		ln = zend_get_compiled_lineno();
 	}
-	return size;
-}
 
-size_t psi_t_align(token_t t, size_t s)
-{
-	size_t a = psi_t_alignment(t);
-	return ((s - 1) | (a - 1)) + 1;
+	va_start(argv, msg);
+	psi_verror(type, fn, ln, msg, argv);
+	va_end(argv);
 }
 
-static impl_val *iterate(impl_val *val, token_t t, unsigned i, impl_val *tmp)
+void psi_error(int type, const char *fn, unsigned ln, const char *msg, ...)
 {
-	size_t size = psi_t_size(t);
-
-	memset(tmp, 0, sizeof(*tmp));
-	memcpy(tmp, val->ptr + size * i, size);
-	return tmp;
-}
+	va_list argv;
 
-void psi_from_zval(impl_val *mem, decl_arg *spec, zval *zv, void **tmp)
-{
-	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_CHAR:
-	case PSI_T_SINT8:
-	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;
-		}
-	default:
-		mem->zend.lval = zval_get_long(zv);
-		break;
-	}
+	va_start(argv, msg);
+	psi_verror(type, fn, ln, msg, argv);
+	va_end(argv);
 }
 
-void *psi_array_to_struct(decl_struct *s, HashTable *arr)
+void psi_verror(int type, const char *fn, unsigned ln, const char *msg, va_list argv)
 {
-	size_t i, j = 0, size = decl_struct_size(s);
-	char *mem = ecalloc(1, size + s->args->count * sizeof(void *));
-
-	for (i = 0; i < s->args->count; ++i) {
-		decl_struct_layout *layout = &s->layout[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 + layout->pos, &val, layout->len);
-			if (tmp) {
-				((void **)(mem + size))[j++] = tmp;
-			}
-		}
-	}
-	return mem;
+	zend_error_cb(type, fn, ln, msg, argv);
 }
 
-void psi_to_array(zval *return_value, token_t t, impl_val *ret_val, decl_var *var)
+static void psi_object_free(zend_object *o)
 {
-	zval ele;
-	unsigned i;
-	impl_val tmp;
-
-	array_init(return_value);
-
-	if (t == PSI_T_STRUCT) {
-		decl_struct *s = real_decl_type(var->arg->type)->strct;
-		ret_val = deref_impl_val(ret_val, var);
-
-		ZEND_ASSERT(s);
-		for (i = 0; i < s->args->count; ++i) {
-			decl_arg *darg = s->args->args[i];
-			decl_struct_layout layout = s->layout[i];
-			impl_val tmp;
-			zval ztmp;
-			char *ptr = (char *) ret_val->ptr + layout.pos;
-
-			memset(&tmp, 0, sizeof(tmp));
-			memcpy(&tmp, ptr, layout.len);
-			switch (real_decl_type(darg->type)->type) {
-			case PSI_T_CHAR:
-				if (darg->var->pointer_level) {
-					psi_to_string(&ztmp, real_decl_type(darg->type)->type, &tmp, darg->var);
-					break;
-				}
-				/* nobreak */
-			case PSI_T_INT:
-			case PSI_T_LONG:
-				psi_to_int(&ztmp, real_decl_type(darg->type)->type, &tmp, darg->var);
-				break;
-			default:
-				printf("t=%d\n", real_decl_type(darg->type)->type);
-				abort();
-			}
-			add_assoc_zval(return_value, darg->var->name, &ztmp);
-		}
-		return;
-	}
-	ret_val = deref_impl_val(ret_val, var);
-	for (i = 0; i < var->arg->var->array_size; ++i) {
-		impl_val *ptr = iterate(ret_val, t, i, &tmp);
-
-		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;
-		}
+	psi_object *obj = PSI_OBJ(NULL, o);
 
-		add_next_index_zval(return_value, &ele);
+	if (obj->data) {
+		/* FIXME: how about registering a destructor?
+		// free(obj->data); */
+		obj->data = NULL;
 	}
+	zend_object_std_dtor(o);
 }
 
-ZEND_RESULT_CODE psi_parse_args(zend_execute_data *execute_data, impl *impl)
+static zend_object *psi_object_init(zend_class_entry *ce)
 {
-	impl_arg *iarg;
-
-	if (!impl->func->args->count) {
-		return zend_parse_parameters_none();
-	}
+	psi_object *o = ecalloc(1, sizeof(*o) + zend_object_properties_size(ce));
 
-	ZEND_PARSE_PARAMETERS_START(psi_num_min_args(impl), impl->func->args->count)
-	nextarg:
-		iarg = impl->func->args->args[_i];
-		if (iarg->def) {
-			Z_PARAM_OPTIONAL;
-		}
-		if (PSI_T_BOOL == iarg->type->type) {
-			if (iarg->def) {
-				iarg->val.zend.bval = iarg->def->type == PSI_T_TRUE ? 1 : 0;
-			}
-			Z_PARAM_BOOL(iarg->val.zend.bval);
-		} else if (PSI_T_INT == iarg->type->type || PSI_T_LONG == iarg->type->type) {
-			if (iarg->def) {
-				iarg->val.zend.lval = zend_atol(iarg->def->text, strlen(iarg->def->text));
-			}
-			Z_PARAM_LONG(iarg->val.zend.lval);
-		} else if (PSI_T_FLOAT == iarg->type->type || PSI_T_DOUBLE == iarg->type->type) {
-			if (iarg->def) {
-				iarg->val.dval = zend_strtod(iarg->def->text, NULL);
-			}
-			Z_PARAM_DOUBLE(iarg->val.dval);
-		} else if (PSI_T_STRING == iarg->type->type) {
-			struct {char *val; size_t len;} str;
-			if (iarg->def) {
-				/* FIXME */
-				str.len = strlen(iarg->def->text) - 2;
-				str.val = &iarg->def->text[1];
-			}
-			Z_PARAM_STR_EX(iarg->val.zend.str, 1, 0);
-			if (iarg->val.zend.str) {
-				zend_string_addref(iarg->val.zend.str);
-			} else if (iarg->def) {
-				iarg->val.zend.str = zend_string_init(str.val, str.len, 0);
-			}
-		} else if (PSI_T_ARRAY == iarg->type->type) {
-			/* handled as _zv in let or set */
-			Z_PARAM_PROLOGUE(0);
-		} else {
-			error_code = ZPP_ERROR_FAILURE;
-			break;
-		}
-		iarg->_zv = _arg;
-		if (_i < _max_num_args) {
-			goto nextarg;
-		}
-	ZEND_PARSE_PARAMETERS_END_EX(return FAILURE);
-
-	return SUCCESS;
+	zend_object_std_init(&o->std, ce);
+	object_properties_init(&o->std, ce);
+	o->std.handlers = &psi_object_handlers;
+	return &o->std;
 }
 
-void *psi_do_calloc(let_calloc *alloc)
-{
-	decl_type *type = real_decl_type(alloc->type);
-	size_t size;
-
-	if (type->type == PSI_T_STRUCT) {
-		/* psi_do_clean expects a NULL pointer after the struct */
-		size = decl_struct_size(type->strct) + sizeof(void *);
-	} else {
-		size = psi_t_size(type->type);
-	}
-
-	return ecalloc(alloc->n, size);
-}
+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) {
+	php_stream *s;
+	zval *r = NULL;
+	int fd = STDOUT_FILENO;
 
-impl_val *psi_do_let(decl_arg *darg)
-{
-	impl_val *arg_val = &darg->let->out;
-	impl_arg *iarg = darg->let->arg;
-
-	if (!iarg) {
-		/* let foo = calloc(1, long);
-		 * let foo = NULL;
-		 * let foo;
-		 */
-		if (darg->let->val->func->type == PSI_T_CALLOC) {
-			arg_val->ptr = psi_do_calloc(darg->let->val->func->alloc);
-			darg->let->mem = arg_val->ptr;
-		} else if (darg->var->array_size) {
-			arg_val->ptr = ecalloc(darg->var->array_size, sizeof(*arg_val));
-			darg->let->mem = arg_val->ptr;
-		} else {
-			memset(arg_val, 0, sizeof(*arg_val));
-		}
-		return arg_val;
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "|r!", &r)) {
+		return;
 	}
+	if (r) {
+		php_stream_from_zval(s, r);
 
-	switch (darg->let->val->func->type) {
-	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 || iarg->type->type == PSI_T_LONG) {
-			arg_val->lval = iarg->val.zend.lval;
-		} else {
-			arg_val->lval = zval_get_long(iarg->_zv);
+		if (SUCCESS != php_stream_cast(s, PHP_STREAM_AS_FD | PHP_STREAM_CAST_INTERNAL, (void **)&fd, 1)) {
+			RETURN_FALSE;
 		}
-		break;
-	case PSI_T_STRVAL:
-		if (iarg->type->type == PSI_T_STRING) {
-			arg_val->ptr = estrdup(iarg->val.zend.str->val);
-			darg->let->mem = arg_val->ptr;
-			zend_string_release(iarg->val.zend.str);
-		} else {
-			zend_string *zs = zval_get_string(iarg->_zv);
-			arg_val->ptr = estrdup(zs->val);
-			darg->let->mem = arg_val->ptr;
-			zend_string_release(zs);
-		}
-		break;
-	case PSI_T_STRLEN:
-		if (iarg->type->type == PSI_T_STRING) {
-			arg_val->lval = iarg->val.zend.str->len;
-			zend_string_release(iarg->val.zend.str);
-		} 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) {
-			decl_type *type = real_decl_type(darg->type);
-
-			switch (type->type) {
-			case PSI_T_STRUCT:
-				arg_val->ptr = psi_array_to_struct(type->strct, HASH_OF(iarg->_zv));
-				darg->let->mem = arg_val->ptr;
-				break;
-			}
-		}
-		break;
-	EMPTY_SWITCH_DEFAULT_CASE();
 	}
-
-	return arg_val;
+	PSI_ContextDump(&PSI_G(context), fd);
 }
 
-void psi_do_set(zval *return_value, set_func *func, decl_vars *vars)
-{
-	impl_val *val = (impl_val *) &vars->vars[0]->arg->let->ptr;
-
-	ZVAL_DEREF(return_value);
-	zval_dtor(return_value);
-
-	switch (func->type) {
-	case PSI_T_TO_STRING:
-		psi_to_string(return_value, real_decl_type(vars->vars[0]->arg->type)->type, val, vars->vars[0]);
-		break;
-	case PSI_T_TO_ARRAY:
-		psi_to_array(return_value, real_decl_type(vars->vars[0]->arg->type)->type, val, vars->vars[0]);
-		break;
-	EMPTY_SWITCH_DEFAULT_CASE();
-	}
-}
+ZEND_BEGIN_ARG_INFO_EX(ai_psi_validate, 0, 0, 1)
+	ZEND_ARG_INFO(0, file)
+ZEND_END_ARG_INFO();
+static PHP_FUNCTION(psi_validate) {
+	zend_string *file;
+	PSI_Parser P;
 
-void psi_do_return(impl *impl, impl_val *ret_val, zval *return_value)
-{
-	switch (impl->stmts->ret.list[0]->func->type) {
-	case PSI_T_TO_STRING:
-		psi_to_string(return_value, real_decl_type(impl->decl->func->type)->type, ret_val, impl->decl->func->var);
-		break;
-	case PSI_T_TO_INT:
-		psi_to_int(return_value, real_decl_type(impl->decl->func->type)->type, ret_val, impl->decl->func->var);
-		break;
-	case PSI_T_TO_ARRAY:
-		psi_to_array(return_value, real_decl_type(impl->decl->func->type)->type, ret_val, impl->decl->func->var);
-		break;
-	EMPTY_SWITCH_DEFAULT_CASE();
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "P", &file)) {
+		return;
 	}
-}
-
-void psi_do_free(free_stmt *fre)
-{
-	size_t i;
 
-	for (i = 0; i < fre->vars->count; ++i) {
-		decl_var *dvar = fre->vars->vars[i];
-
-		if (dvar->arg && dvar->arg->let->out.ptr) {
-			free(dvar->arg->let->out.ptr);
-			dvar->arg->let->out.ptr = NULL;
-		}
+	if (!PSI_ParserInit(&P, file->val, psi_error_wrapper, 0)) {
+		RETURN_FALSE;
 	}
-}
-
-void psi_do_clean(impl *impl)
-{
-	size_t i;
 
-	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);
-			}
+	while (0 < PSI_ParserScan(&P)) {
+		PSI_ParserParse(&P, PSI_TokenAlloc(&P));
+		if (P.num == PSI_T_EOF) {
 			break;
 		}
 	}
+	PSI_ParserParse(&P, NULL);
 
-	if (impl->decl->args) for (i = 0; i < impl->decl->args->count; ++i) {
-		decl_arg *darg = impl->decl->args->args[i];
-
-		if (darg->let && darg->let->mem) {
-			decl_type *type = real_decl_type(darg->type);
-
-			if (type->type == PSI_T_STRUCT) {
-				size_t eos = decl_struct_size(type->strct);
-				void **ptr = (void **) ((char *) darg->let->mem + eos);
-
-				while (*ptr) {
-					efree(*ptr++);
-				}
-			}
-			efree(darg->let->mem);
-			darg->let->mem = NULL;
-		}
+	if (0 == PSI_ContextValidateData(NULL, PSI_DATA(&P)) && !P.errors) {
+		RETVAL_TRUE;
+	} else {
+		RETVAL_FALSE;
 	}
+	PSI_ParserDtor(&P);
 }
 
-PHP_MINIT_FUNCTION(psi)
+static PHP_MINIT_FUNCTION(psi)
 {
-	PSI_ContextOps *ops;
+	PSI_ContextOps *ops = NULL;
+	zend_class_entry ce = {0};
+	unsigned flags = psi_check_env("PSI_DEBUG") ? PSI_PARSER_DEBUG : (
+			psi_check_env("PSI_SILENT") ? PSI_PARSER_SILENT : 0);
 
 	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;
+
+#ifdef HAVE_LIBJIT
 	if (!strcasecmp(PSI_G(engine), "jit")) {
 		ops = PSI_Libjit();
-	} else {
+	} else
+#endif
+#ifdef HAVE_LIBFFI
 		ops = PSI_Libffi();
+#endif
+
+	if (!ops) {
+		php_error(E_WARNING, "No PSI engine found");
+		return FAILURE;
 	}
 
-	PSI_ContextInit(&PSI_G(context), ops, psi_error);
+	PSI_ContextInit(&PSI_G(context), ops, psi_error_wrapper, flags);
 	PSI_ContextBuild(&PSI_G(context), PSI_G(directory));
 
+	if (psi_check_env("PSI_DUMP")) {
+		PSI_ContextDump(&PSI_G(context), STDOUT_FILENO);
+	}
+
 	return SUCCESS;
 }
-PHP_MSHUTDOWN_FUNCTION(psi)
+
+static PHP_MSHUTDOWN_FUNCTION(psi)
 {
 	PSI_ContextDtor(&PSI_G(context));
 
@@ -668,28 +204,15 @@ PHP_MSHUTDOWN_FUNCTION(psi)
 	return SUCCESS;
 }
 
-/* Remove if there's nothing to do at request start */
-/* {{{ PHP_RINIT_FUNCTION
- */
-PHP_RINIT_FUNCTION(psi)
-{
 #if defined(COMPILE_DL_PSI) && defined(ZTS)
-	ZEND_TSRMLS_CACHE_UPDATE();
-#endif
-	return SUCCESS;
-}
-/* }}} */
-
-/* Remove if there's nothing to do at request end */
-/* {{{ PHP_RSHUTDOWN_FUNCTION
- */
-PHP_RSHUTDOWN_FUNCTION(psi)
+static PHP_RINIT_FUNCTION(psi)
 {
+	ZEND_TSRMLS_CACHE_UPDATE();
 	return SUCCESS;
 }
-/* }}} */
+#endif
 
-PHP_MINFO_FUNCTION(psi)
+static PHP_MINFO_FUNCTION(psi)
 {
 	php_info_print_table_start();
 	php_info_print_table_header(2, "psi support", "enabled");
@@ -697,7 +220,10 @@ PHP_MINFO_FUNCTION(psi)
 
 	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_END
 };
 
@@ -707,8 +233,12 @@ zend_module_entry psi_module_entry = {
 	psi_functions,
 	PHP_MINIT(psi),
 	PHP_MSHUTDOWN(psi),
+#if defined(COMPILE_DL_PSI) && defined(ZTS)
 	PHP_RINIT(psi),		/* Replace with NULL if there's nothing to do at request start */
-	PHP_RSHUTDOWN(psi),	/* Replace with NULL if there's nothing to do at request end */
+#else
+	NULL,
+#endif
+	NULL,
 	PHP_MINFO(psi),
 	PHP_PSI_VERSION,
 	STANDARD_MODULE_PROPERTIES