X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fmodule.c;h=152c949dabedd873dc9076a62ea96ea2aa54536b;hp=bde40a4524244c2c8bc90d074cfffeeb10186d68;hb=cfebc76ed7426836f21296cca9a14b422bfa04cf;hpb=d59f10e81c33354ee1589fb10847b4611423de2e

diff --git a/src/module.c b/src/module.c
index bde40a4..152c949 100644
--- a/src/module.c
+++ b/src/module.c
@@ -11,8 +11,6 @@
 #include "zend_operators.h"
 
 #include "php_psi.h"
-#include "parser.h"
-#include "context.h"
 
 #if HAVE_LIBJIT
 # include "libjit.h"
@@ -35,16 +33,25 @@ PHP_INI_END();
 static zend_object_handlers psi_object_handlers;
 static zend_class_entry *psi_class_entry;
 
-void psi_error(int type, const char *msg, ...)
+void psi_error_wrapper(PSI_Token *t, int type, const char *msg, ...)
 {
-	char buf[0x1000];
 	va_list argv;
 
 	va_start(argv, msg);
-	vslprintf(buf, 0x1000, msg, argv);
+	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;
 
-	php_error(type, buf);
+	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)
@@ -124,13 +131,26 @@ zend_internal_arg_info *psi_internal_arginfo(impl *impl)
 	zend_internal_arg_info *aip;
 	zend_internal_function_info *fi;
 
-	aip = calloc(impl->func->args->count + 1, sizeof(*aip));
+	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;
+	}
+
 	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];
@@ -273,37 +293,39 @@ void psi_to_double(zval *return_value, set_value *set, impl_val *ret_val)
 
 void psi_to_string(zval *return_value, set_value *set, impl_val *ret_val)
 {
+	char *str;
 	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:
+	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:
 		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 (var->arg->var->array_size) {
+				str = (char *) ret_val;
+			} else {
+				str = ret_val->ptr;
+			}
+			if (str) {
 				if (set->num) {
-					RETVAL_STRINGL(ret_val->ptr, psi_long_num_exp(set->num, set->outer.val));
+					zend_long n = psi_long_num_exp(set->num, set->outer.val);
+					RETVAL_STRINGL(str, n);
 				} else {
-					RETVAL_STRING(ret_val->ptr);
+					RETVAL_STRING(str);
 				}
 			} 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);
 }
@@ -312,7 +334,7 @@ void psi_to_string(zval *return_value, set_value *set, impl_val *ret_val)
 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);
+	memcpy(tmp, ((void*) val) + size * i, size);
 	return tmp;
 }
 
@@ -366,6 +388,11 @@ void *psi_array_to_struct(decl_struct *s, HashTable *arr)
 	return mem;
 }
 
+void psi_to_recursive(zval *return_value, set_value *set, impl_val *r_val)
+{
+	set->outer.set->func->handler(return_value, set, r_val);
+}
+
 void psi_to_array(zval *return_value, set_value *set, impl_val *r_val)
 {
 	size_t i;
@@ -373,7 +400,7 @@ void psi_to_array(zval *return_value, set_value *set, impl_val *r_val)
 	token_t t = real_decl_type(var->arg->type)->type;
 	impl_val tmp, *ret_val = deref_impl_val(r_val, var);
 
-	if ((intptr_t) ret_val->ptr <= (intptr_t) 0) {
+	if ((intptr_t) ret_val <= (intptr_t) 0) {
 		RETURN_NULL();
 	}
 
@@ -388,13 +415,13 @@ void psi_to_array(zval *return_value, set_value *set, impl_val *r_val)
 				set_value *sub_set = set->inner[i];
 				decl_var *sub_var = sub_set->vars->vars[0];
 
-				sub_set->outer.val = r_val;
+				sub_set->outer.val = ret_val;
 
 				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);
+					val = struct_member_ref(sub_var->arg, ret_val, &tmp);
 					sub_set->func->handler(&ztmp, sub_set, val);
 					add_assoc_zval(return_value, sub_var->name, &ztmp);
 
@@ -430,20 +457,32 @@ void psi_to_array(zval *return_value, set_value *set, impl_val *r_val)
 		}
 		return;
 	} else if (set->num) {
-		/* to_array(arr_var, num_expr, to_int(*arr_var))
-		 */
+		/* to_array(arr_var, num_expr, to_int(*arr_var)) */
 		zval ele;
+		char *ptr;
 		zend_long i, n = psi_long_num_exp(set->num, set->outer.val);
+		size_t size = psi_t_size(var->arg->var->pointer_level ? PSI_T_POINTER : t);
+		set_value *sub_set = set->inner[0];
 
+		sub_set->outer.val = 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);
+			ptr = (char *) ret_val->ptr + i * size;
+			sub_set->func->handler(&ele, sub_set, (void *) ptr);
 			add_next_index_zval(return_value, &ele);
 		}
 	} else {
-		ZEND_ASSERT(0);
+		/* to_array(arr_var, to_int(*arr_var)) */
+		zval ele;
+		char *ptr = ret_val->ptr;
+		size_t size = psi_t_size(var->arg->var->pointer_level ? PSI_T_POINTER : t);
+		set_value *sub_set = set->inner[0];
+
+		sub_set->outer.val = set->outer.val;
+		while (*(void **) ptr) {
+			sub_set->func->handler(&ele, sub_set, (void *) ptr);
+			add_next_index_zval(return_value, &ele);
+			ptr += size;
+		}
 	}
 }
 
@@ -465,7 +504,6 @@ void psi_to_object(zval *return_value, set_value *set, impl_val *r_val)
 static inline ZEND_RESULT_CODE psi_parse_args(zend_execute_data *execute_data, impl *impl)
 {
 	size_t i;
-	zval *zarg = ZEND_CALL_ARG(execute_data, 0);
 	impl_arg *iarg;
 	zend_error_handling zeh;
 
@@ -479,11 +517,26 @@ static inline ZEND_RESULT_CODE psi_parse_args(zend_execute_data *execute_data, i
 		return rv;
 	}
 
-	ZEND_PARSE_PARAMETERS_START(psi_num_min_args(impl), impl->func->args->count)
+	ZEND_PARSE_PARAMETERS_START(psi_num_min_args(impl), impl->func->args->vararg.name ? -1 : impl->func->args->count)
 	nextarg:
-		iarg = impl->func->args->args[_i];
-		if (iarg->def) {
+		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);
@@ -500,10 +553,14 @@ static inline ZEND_RESULT_CODE psi_parse_args(zend_execute_data *execute_data, i
 			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;
 		}
@@ -514,12 +571,9 @@ static inline ZEND_RESULT_CODE psi_parse_args(zend_execute_data *execute_data, i
 
 	/* set up defaults */
 	for (i = 0; i < impl->func->args->count; ++i) {
-		iarg = impl->func->args->args[i];
+		if (i >= EX_NUM_ARGS() && iarg->def) {
+			iarg = impl->func->args->args[i];
 
-		if (i < EX_NUM_ARGS()) {
-			iarg->_zv = ++zarg;
-			ZVAL_DEREF(iarg->_zv);
-		} else if (iarg->def) {
 			switch (iarg->type->type) {
 			case PSI_T_BOOL:
 				iarg->val.zend.bval = iarg->def->type == PSI_T_TRUE ? 1 : 0;
@@ -548,9 +602,94 @@ static inline void *psi_do_calloc(let_calloc *alloc)
 	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 *));
+#if 0
+	fprintf(stderr, "calloc: %p\n", mem);
+#endif
 	return mem;
 }
 
+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();
+	}
+	return SUCCESS;
+}
+
 static inline void *psi_do_let(let_stmt *let)
 {
 	decl_arg *darg = let->var->arg;
@@ -559,7 +698,12 @@ static inline void *psi_do_let(let_stmt *let)
 
 	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);
+		memcpy(arg_val, deref_impl_val(let->val->data.var->arg->let->ptr, let->val->data.var), sizeof(*arg_val));
+#if 0
+		fprintf(stderr, "LET TMP: %p -> %p\n",
+				let->val->data.var->arg->let->ptr,
+				arg_val->ptr);
+#endif
 		break;
 	case PSI_LET_NULL:
 		if (darg->var->array_size) {
@@ -579,81 +723,8 @@ static inline void *psi_do_let(let_stmt *let)
 	case PSI_LET_FUNC:
 		iarg = let->val->data.func->arg;
 
-		switch (let->val->data.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) {
-				arg_val->lval = iarg->val.zend.lval;
-			} else {
-				arg_val->lval = zval_get_long(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);
-					darg->mem = arg_val->ptr;
-				} else {
-					arg_val->ptr = "";
-				}
-			} else {
-				zend_string *zs = zval_get_string(iarg->_zv);
-				arg_val->ptr = estrdup(zs->val);
-				darg->mem = arg_val->ptr;
-				zend_string_release(zs);
-			}
-			if (PSI_T_PATHVAL == darg->let->val->data.func->type) {
-				if (SUCCESS != php_check_open_basedir(arg_val->ptr)) {
-					efree(arg_val->ptr);
-					return NULL;
-				}
-			}
-			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) {
-				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->mem = arg_val->ptr;
-					break;
-				}
-			}
-			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 NULL;
-				}
-
-				obj = PSI_OBJ(iarg->_zv, NULL);
-				arg_val->ptr = obj->data;
-			}
-			break;
-		EMPTY_SWITCH_DEFAULT_CASE();
+		if (SUCCESS != psi_let_val(let->val->data.func->type, iarg, darg->ptr, real_decl_type(darg->type)->strct, &darg->mem)) {
+			return NULL;
 		}
 	}
 
@@ -666,8 +737,10 @@ static inline void *psi_do_let(let_stmt *let)
 
 static inline void psi_do_set(zval *return_value, set_value *set)
 {
+	decl_arg *set_arg = set->vars->vars[0]->arg;
+
 	zval_dtor(return_value);
-	set->func->handler(return_value, set, set->vars->vars[0]->arg->ptr);
+	set->func->handler(return_value, set, set_arg->let ? set_arg->let->ptr : set_arg->ptr);
 }
 
 static inline void psi_do_return(zval *return_value, return_stmt *ret)
@@ -678,7 +751,6 @@ static inline void psi_do_return(zval *return_value, return_stmt *ret)
 static inline void psi_do_free(free_stmt *fre)
 {
 	size_t i, j;
-	impl_val dummy;
 
 	for (i = 0; i < fre->calls->count; ++i) {
 		free_call *f = fre->calls->list[i];
@@ -691,7 +763,7 @@ static inline void psi_do_free(free_stmt *fre)
 		}
 
 		/* FIXME: check in validate_* that free functions return scalar */
-		PSI_ContextCall(&PSI_G(context), &dummy, f->decl);
+		PSI_ContextCall(&PSI_G(context), &f->decl->call, NULL);
 	}
 }
 
@@ -728,6 +800,29 @@ static inline void psi_do_clean(impl *impl)
 			darg->mem = NULL;
 		}
 	}
+
+	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 (impl->func->args->vararg.values) {
+		efree(impl->func->args->vararg.values);
+		impl->func->args->vararg.values = NULL;
+	}
+	if (impl->func->args->vararg.free_list) {
+		void **list = impl->func->args->vararg.free_list;
+
+		while (*list) {
+			efree(*list++);
+		}
+
+		efree(impl->func->args->vararg.free_list);
+		impl->func->args->vararg.free_list = NULL;
+	}
 }
 
 static inline int psi_calc_num_exp_value(num_exp *exp, impl_val *strct, impl_val *res) {
@@ -759,6 +854,8 @@ static inline int psi_calc_num_exp_value(num_exp *exp, impl_val *strct, impl_val
 	case PSI_T_NAME:
 		if (strct) {
 			ref = struct_member_ref(exp->u.dvar->arg, strct, &tmp);
+		} else if (exp->u.dvar->arg->let) {
+			ref = exp->u.dvar->arg->let->ptr;
 		} else {
 			ref = exp->u.dvar->arg->ptr;
 		}
@@ -956,13 +1053,72 @@ PSI_CALC_FN(sub)
 #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;
+	}
+}
+
+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;
+	}
+
+	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();
+		}
+
+		va->types[i] = vatype;
+		psi_let_val(let_fn, vaarg, &va->values[i], NULL, &to_free);
+
+		if (to_free) {
+			if (!va->free_list) {
+				va->free_list = ecalloc(vacount - i + 1, sizeof(*va->free_list));
+			}
+			va->free_list[j++] = to_free;
+		}
+	}
+
+	return va;
+}
+
 void psi_call(zend_execute_data *execute_data, zval *return_value, impl *impl)
 {
 	size_t i;
-	return_stmt *ret = impl->stmts->ret.list[0];
-	decl_var *var = ret->set->vars->vars[0];
+	impl_vararg *va = NULL;
 
-	memset(var->arg->ptr, 0, sizeof(impl_val));
+	memset(impl->decl->func->ptr, 0, sizeof(impl_val));
 
 	if (SUCCESS != psi_parse_args(execute_data, impl)) {
 		return;
@@ -972,18 +1128,22 @@ void psi_call(zend_execute_data *execute_data, zval *return_value, impl *impl)
 		let_stmt *let = impl->stmts->let.list[i];
 
 		if (!psi_do_let(let)) {
-			psi_do_return(return_value, ret);
+			psi_do_return(return_value, impl->stmts->ret.list[0]);
 			psi_do_clean(impl);
 			return;
 		}
 	}
 
-	if (impl->decl->args) for (i = 0; i < impl->decl->args->count; ++i) {
-		impl->decl->call.args[i] = impl->decl->args->args[i]->let->ptr;
+	if (impl->decl->args) {
+		psi_do_args(impl);
+
+		if (impl->func->args->vararg.args) {
+			va = psi_do_varargs(impl);
+		}
 	}
 
-	PSI_ContextCall(&PSI_G(context), var->arg->ptr, impl->decl);
-	psi_do_return(return_value, ret);
+	PSI_ContextCall(&PSI_G(context), &impl->decl->call, va);
+	psi_do_return(return_value, impl->stmts->ret.list[0]);
 
 	for (i = 0; i < impl->stmts->set.count; ++i) {
 		set_stmt *set = impl->stmts->set.list[i];
@@ -1052,7 +1212,7 @@ PHP_MINIT_FUNCTION(psi)
 		return FAILURE;
 	}
 
-	PSI_ContextInit(&PSI_G(context), ops, psi_error);
+	PSI_ContextInit(&PSI_G(context), ops, psi_error_wrapper);
 	PSI_ContextBuild(&PSI_G(context), PSI_G(directory));
 
 	if (psi_check_env("PSI_DUMP")) {